- 20 Oct, 2016 17 commits
-
-
Dmitriy Zaporozhets authored
Wait for ajax for every merge request spinach test ## What does this MR do? * removes duplicate `WaitForAjax` module * ensure we run `wait_for_ajax`after each MR spinach tests ## Why was this MR needed? Because when visit MR page we do ajax call to check CI status. When testing this page with spinach and JS driver we got random failing tests. It happens because of race condition db cleaner drop data before ajax call finished. So we make sure that every MR spinach scenario with js driver waits for ajax before running next scenario ## What are the relevant issue numbers? Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/23461 See merge request !6959
-
Sean McGivern authored
fix: commit messages being double-escaped in activities tab See merge request !6937
-
Sean McGivern authored
Stop event_commit_title from escaping its output Fixes a double-escape issue (actually triple-escape!) viewing the activity feed Closes #23311 Related to #23258 !6832 See merge request !6930
-
Annabel Dunstone Gray authored
Change input order on Sign In form for better tabbing. ## What does this MR do? This unreverts 8751491b, which was mistakenly reverted in !6328. It also changes the implementation of the original commit to work with the new login styling and markup. cc: @ClemMakesApps ## Screenshots (if relevant) (Disregard the grey borders on invalid inputs -- for some reason, Gifox isn't picking up some colors for me
🤷 ) ![2016-10-17_11.32.05](/uploads/f395b2d77fb47cac3f9d4fa1bc3d7d71/2016-10-17_11.32.05.gif) ## Does this MR meet the acceptance criteria? - [x] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6867 See merge request !6928 -
Sean McGivern authored
Create project feature when project is created closes #22944 See merge request !6908
-
Fatih Acet authored
Smaller min-width for MR pipeline table ## What does this MR do? Nests class under `.tab-pane` to make sure buttons don't get cut off ## Screenshots (if relevant) ![Screen_Shot_2016-10-14_at_11.00.02_AM](/uploads/6e19e0375721f2cb58223c2e7ed89308/Screen_Shot_2016-10-14_at_11.00.02_AM.png) ## What are the relevant issue numbers? Closes #23346 See merge request !6893
-
Rémy Coutable authored
API: Fix Sytem hooks delete behavior ## What does this MR do? This corrects the delete API for system hooks. Returning 200 is not the right way indicating a hooks is not found. ## What are the relevant issue numbers? Discussed in https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6861/diffs#609af00c90e3d5241064d1404e3e018a3235634a_64_62 See merge request !6883
-
Sean McGivern authored
Add Nofollow for uppercased external url protocols Closes #22782 See merge request !6820
-
Jacob Schatz authored
Triggered pipelines #### What does this MR do? Separates trigger into its own column #### Screenshots (if relevant) ![Screen_Shot_2016-10-07_at_4.21.54_PM](/uploads/092e8205d329b66b34045fe17c5e6e4f/Screen_Shot_2016-10-07_at_4.21.54_PM.png) ![Screen_Shot_2016-10-17_at_9.13.10_AM](/uploads/7df90e0e2a07a9f282df3605787d3cc2/Screen_Shot_2016-10-17_at_9.13.10_AM.png) ![Screen_Shot_2016-10-17_at_9.15.07_AM](/uploads/b7dc0307c8549e72c3f812c3cd91833a/Screen_Shot_2016-10-17_at_9.15.07_AM.png) #### What are the relevant issue numbers? Closes #19991 See merge request !6753
-
Douwe Maan authored
Prevent wrong markdown on issue ids when project has Jira service activated fixes gitlab-org/gitlab-ee#828 See merge request !6728
-
Rémy Coutable authored
Delete dynamic environments - Adds "close environment" action to a merge request - Adds tabs to environments list - Adds close button to each environment row in environments list - Replaces Destroy button with Close button inside an environment - Adds close button to builds list inside an environment In order to enable stopping environments a valid `.gitlab-ci.yml` syntax has to be used: ``` review: environment: name: review/$app on_stop: stop_review stop_review: script: echo Delete My App when: manual environment: name: review/$app action: stop ``` This MR requires that `stop_review` has to have: `when`, `environment:name` and `environment:action` defined. The next MR after this one will verify that and enforce that these settings are configured. It will also implicitly configure these settings, making it possible to define it like this: ``` review: environment: name: review/$app on_stop: stop_review stop_review: script: echo Delete My App ``` Closes #22191 See merge request !6669 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Douwe Maan authored
Add group level labels. * `LabelsFinder` * `Gitlab::Gfm::ReferenceRewriter` * `Banzai::Filter::LabelReferenceFilter` We'll be adding more feature that allow you to do cross-project management of issues. loses #19997 See merge request !6425 Signed-off-by: Rémy Coutable <remy@rymai.me>
-
Annabel Dunstone Gray authored
Add tooltip with jobs full name to pipelines graph ## What does this MR do? This MR adds a tooltip to build items in the pipelines graph as some build names are truncated. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Some job names that are truncated need to be fully identified to avoid confusion. ## Screenshots (if relevant) [Latest screenies here!](https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6403#note_16968703). ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #22089 See merge request !6403
-
Jacob Schatz authored
Changed build header username area to use the full name with the username as the tooltip ## What does this MR do? Changes build header username to use the full name with the username as the tooltip. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? UI consistency ## Screenshots (if relevant) ![2016-09-08_19.24.22](/uploads/958422819ae3057f1499b2686d83e326/2016-09-08_19.24.22.gif) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if you do - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Contributes to #21832 See merge request !6272
-
Fatih Acet authored
Add pipelines tab to new MR #### What does this MR do? Adds pipelines tab to new MRs #### Screenshots (if relevant) ![Screen_Shot_2016-10-10_at_10.23.27_AM](/uploads/6c3f8f2be0cf9ba7cc78f6d918307ec0/Screen_Shot_2016-10-10_at_10.23.27_AM.png) ![Screen_Shot_2016-10-11_at_8.59.45_AM](/uploads/e67577d92327eafef6f04073f3d94212/Screen_Shot_2016-10-11_at_8.59.45_AM.png) #### What are the relevant issue numbers? Closes #21444 See merge request !6238
-
Jacob Schatz authored
Fix retried builds styling #### What does this MR do? Adds background color to retried builds and an icon + tooltip on retried builds in build list #### Screenshots (if relevant) <img src="/uploads/4138dd277c185de3c271b2eb9b459761/Screen_Shot_2016-10-13_at_2.44.27_PM.png" width="500px"> <img src="/uploads/99227d5ed3816a509660fe5a84da5b2a/Screen_Shot_2016-10-13_at_3.01.13_PM.png" width="500px"> #### What are the relevant issue numbers? Closes #21192 See merge request !6109
-
Kamil Trzciński authored
Add a new pipeline email service ## What does this MR do? Add a new pipeline email service ## What are the relevant issue numbers? Closes #3976 ## Remaining tasks * [x] Preserve `·` and ` ` * [x] Use XHTML 1.0 * [ ] Use the same layout (`app/views/layouts/notify.html.haml`) * [ ] Digest or not (assets or public) * [x] A similar email for succeeded pipeline * [x] Plain text versions for both emails ## Screenshots (if relevant) https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6019#note_16594345 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] `PipelinesEmailService` - [x] `SendPipelineNotificationService` See merge request !6019
-
- 18 Oct, 2016 23 commits
-
-
Rémy Coutable authored
-
Rémy Coutable authored
-
Rémy Coutable authored
LDAP login style fixups ## What does this MR do? * Addresses regression found here: https://gitlab.com/gitlab-org/gitlab-ce/issues/23435 * Adds border radius to left/right tabs ## Are there points in the code the reviewer needs to double check? So you know what you're seeing, there are three types of fixes going on here: 1. Template syntax errors that were displaying template-like language in the DOM (specifically with ldap and crowd username labels 2. Aesthetic problems in tabs that arise with more than 2 tabs 3. LDAP and crowd tab functionality. I had to move each panel into its own login box, to ensure that each panel's id synced with its associated tab's href, and that each panel was at an equal depth within the DOM. I assumed bootstrap tabs would look deeper into the login-box to find panels that matched the tabs. This is not true. The reason I didn't catch this is that in development I was just manually changing template flags to force rendering. I didn't realize I could enable ldap in CE within the gitlab.yml file
🤦 See merge request !6947 -
Rémy Coutable authored
Use GrapeDSL for commits See merge request !6914
-
Rémy Coutable authored
-
Kamil Trzciński authored
Fix save button on pipelines settings page ## What does this MR do? This MR fixes 'Save button' on pipeline settings page, which didn't change state to enabled after saving settings. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [ ] All builds are passing ## What are the relevant issue numbers? Closes #23431 See merge request !6955
-
Kamil Trzciński authored
Make cancelled pipelines being able to retry ## What does this MR do? Make cancelled pipelines being able to retry ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [x] Added for this feature/bug ## What are the relevant issue numbers? Closes #23326 See merge request !6927
-
Sean McGivern authored
Add visibility level to project repository implements #19734 See merge request !6396
-
Douwe Maan authored
Add a be_like_time matcher and use it in specs ## What does this MR do? Introduces a be_like_time matcher and refactors existing code to use it ## Are there points in the code the reviewer needs to double check? A few sites use be_within(2.seconds) or 5.minutes - I didn't change those ## Why was this MR needed? A custom matcher helps to document that we need to compare times loosely, and keeps the fudge factor from being declared in multiple places. ## Screenshots (if relevant) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Related to !6935 See merge request !6936
-
Phil Hughes authored
-
Grzegorz Bizon authored
-
Grzegorz Bizon authored
-
Bryce Johnson authored
-
Grzegorz Bizon authored
-
Bryce Johnson authored
-
Bryce Johnson authored
-
Sean McGivern authored
Fix the diff in the merge request view when converting a symlink to a regular file ## What does this MR do? It fixes a bug described in #21610 ## Why was this MR needed? There was a regression introduced in https://gitlab.com/gitlab-org/gitlab-ce/commit/cd7c2cb6ddd4d9c9f9bdae00c887c0022c121c17 ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] All builds are passing - [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [x] Branch has no merge conflicts with `master` (if it does - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Fixes #21610 See merge request !6828
-
Yorick Peterse authored
Execute specific named route method from toggle_award_url helper method See merge request !6848
-
Kamil Trzciński authored
Avoid race condition when expiring artifacts ## What does this MR do? It may happen that job which purpose is to remove expired artifacts will be executed asynchronously when, in the meantime, project associated with given build gets removed by another async job. In that case we should not remove artifacts because such build will be eventually removed anyway along with artifacts, when project removal is complete. ## Does this MR meet the acceptance criteria? - [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - Tests - [x] Added for this feature/bug - [x] All builds are passing ## What are the relevant issue numbers? Closes #22296 See merge request !6881
-
Lin Jen-Shin authored
* upstream/master: (58 commits) Update endpoint to username validator change border color to variable Add todo for deprecated user routes and more information about deprecation to changelog Provide better error message to the user Apply better hierarchy to markdown headers and issue/mr titles Swapped button text manipulation outcomes for the toggle query Fixed find file keyboard navigation Update CHANGELOG for 8.12.7 Added download-button class and applied button margin Enable activerecord_sane_schema_dumper for test Updated logo from @luke Fix broken specs on MySQL after https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/6896 Fix Test Env (proper error handling when gitlab-shell is not clonned) Fix randomly crashing spinach test for merge request [Great spinach fix] Replace gsub with delete Remove carriage returns from commit description as summary is on a newline and will always include carriage returns Convert due_date_select.js filetype to es6. Stop directly parsing due_date with Date.parse, prefer parsing implicitly. Improve spec for pipeline metrics worker Add Pipeline metrics worker ...
-
Grzegorz Bizon authored
[ci skip]
-
Bryce Johnson authored
-
Bryce Johnson authored
-