- 18 Oct, 2016 40 commits
-
-
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
-
Jacob Schatz authored
Add missing Vue dependency Cycle Analytics is broken because vueJS is not included. This feature will be improved on its second iteration, and also tests will be aded so this won't happen again. See merge request !6965
-
Alfredo Sumaran authored
-
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
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
-
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
-
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
-
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
-
Dmitriy Zaporozhets authored
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
-
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
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Annabel Dunstone Gray authored
-
Annabel Dunstone authored
-
Sean McGivern authored
Add visibility level to project repository implements #19734 See merge request !6396
-
Nick Thomas authored
Return a non-html-safe, unescaped String instead of ActiveSupport::SafeBuffer to preserve safety when the output is misused. Currently there's oly one user, which does the right thing. Closes #23311
-
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
-
Bryce Johnson authored
-
Bryce Johnson authored
-
Bryce Johnson authored
-