Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
AgeCommit message (Collapse)Author
2016-05-21Merge branch 'dropdown-enter-select' into 'master' Jacob Schatz
Fixed issue with enter key selecting wrong option in dropdown If you search for a label and press enter the dropdown will select the last element rather than the first. This is because the currentIndex is -1 rather than 0 ![labels](/uploads/eb29924109947fd63fea32e21471f05a/labels.gif) Closes #17630 See merge request !4210
2016-05-21Merge branch 'merge-immediately-button-color-fix' into 'master' Jacob Schatz
Fixed issue with merge button color ![Screen_Shot_2016-05-19_at_12.51.35](/uploads/a2768908553961e88c5a8f0e1f343078/Screen_Shot_2016-05-19_at_12.51.35.png) Closes #17644 See merge request !4211
2016-05-21Merge branch 'fix/style-empty-groups' into 'master' Jacob Schatz
Wrap "No groups found" message with a .nothing-here-block The "No groups found" message's style is inconsistent with the other empty messages. ## Screenshots ### Empty groups ![Screen_Shot_2016-05-13_at_13.40.34](/uploads/1447c5f60cde7d50d6f8f07c41704e5c/Screen_Shot_2016-05-13_at_13.40.34.png) ### Empty projects ![Screen_Shot_2016-05-13_at_13.40.30](/uploads/c21ff093f3d6bdbafecf7b075fa33d3c/Screen_Shot_2016-05-13_at_13.40.30.png) See merge request !4137
2016-05-21Merge branch 'zj-gitignore-dropdown'Douwe Maan
2016-05-21Merge branch 'rm-source-branch' into 'master' Douwe Maan
Allows MR authors to have the source branch removed when merging the MR closes #13191 The location of the checkbox might not be optimal so any feedback is welcome. Any other feedback too obviously. Screenshot: ![Screenshot_2016-02-17_21.25.24](/uploads/a9c3eaafb39c6f5b4f0949a2278af6da/Screenshot_2016-02-17_21.25.24.png) See merge request !2801
2016-05-21Merge branch 'adambutler/gitlab-ce-feature/support-diff-of-issue-title-rename'Douwe Maan
# Conflicts: # app/services/system_note_service.rb
2016-05-21Merge branch 'issue_14684_2' into 'master' Douwe Maan
current_user.confirmed_at.present? => current_user.confirmed? fixes: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3862/diffs#4f7b76b1197d6fb073f77957b3b7b70d921ed7e7_42_41 See merge request !4225
2016-05-21Merge branch 'eReGeBe/gitlab-ce-feature/milestone-md' into 'master' Douwe Maan
Implement special GitLab markdown reference for milestones https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3453 by @eReGeBe, with two additions: - Move changelog item to 8.8 - Fix cross-project milestone ref with invalid project, like https://gitlab.com/gitlab-org/gitlab-ce/commit/f7348cd348ad8f4a18d74dd668283a4e236f5790 did for labels Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/13829 See merge request !3897
2016-05-21Merge branch 'issue_9013' into 'master' Douwe Maan
Let users set notification levels in projects which they are not members Fixes #9013 See merge request !3986
2016-05-20Dropdown implementationAlfredo Sumaran
2016-05-20Dropdown implementationAlfredo Sumaran
2016-05-20First import of gitignoresZeger-Jan van de Weg
Add .gitignore dropdown when creating a new .gitignore file Signed-off-by: Alfredo Sumaran <alfredo@gitlab.com>
2016-05-20Backend for a gitignores dropdownZeger-Jan van de Weg
2016-05-20Merge branch 'issue-17537-fix' into 'master' Douwe Maan
Fix Error 500 when attempting to retrieve project license when HEAD points to non-existent ref Closes #17537 See merge request !4151
2016-05-20Merge branch 'rs-issue-3055' into 'master' Douwe Maan
Use extended regexp flag for `git grep`-ing files Closes #3055 See merge request !4203
2016-05-20current_user.confirmed_at.present? => current_user.confirmed?Felipe Artur
2016-05-20refactor project to include some nicer EE stuffJames Lopez
2016-05-20Allows MR authors to have the source branch removed when merging the MRJeroen Jacobs
2016-05-20Fixed issue with enter key selecting wrong option in dropdownPhil Hughes
If you search for a label and press enter the dropdown will select the last element rather than the first. This is because the currentIndex is -1 rather than 0 Closes #17630
2016-05-20Fixed issue with merge button colorPhil Hughes
Closes #17644
2016-05-20Use the right default notification settings for non membersFelipe Artur
2016-05-20Merge branch 'feature/runner-config-untagged-jobs' into 'master' Robert Speicher
Add config for CI Runner that prevents it from picking untagged jobs Closes #3456 See merge request !4039
2016-05-20Merge branch 'fix-ci-commit-creation' into 'master' Rémy Coutable
Fix creation of Ci::Commit object which can lead to pending, failed in some scenarios ## What does this MR do? If we use a new `project.ci_commits` it will add it to array, and some other services which can do a save on a project can lead to a scenario when `ci_commit` will be saved, where it should not be. ## What are the relevant issue numbers? https://gitlab.com/gitlab-com/support-forum/issues/717 https://gitlab.com/gitlab-com/support-forum/issues/715 https://gitlab.com/gitlab-org/gitlab-ce/issues/17596 https://gitlab.com/gitlab-com/support-forum/issues/714 https://gitlab.com/gitlab-org/gitlab-ce/issues/13402 cc @rymai See merge request !4214
2016-05-20Merge branch 'create-todo-on-failing-build' into 'master' Douwe Maan
Create a todo on failing MR build Implements #14067. I worked on this with @DouweM (any mistakes are mine). When a build fails for a commit, create a todo for the author of the merge request that commit is the HEAD of. If the commit isn't the HEAD commit of any MR, don't do anything. If there already is a todo for that user and MR, don't do anything. Current limitations: - This isn't configurable by project. - The author of a merge request might not be the person who pushed the breaking commit. - I haven't tested this with a working CI setup, just with the unit tests below and by modifying my DB directly. See merge request !3177
2016-05-20Merge branch '17464-backport-email-syntax-highlighting' into 'master' Douwe Maan
Syntax-highlight diffs in push emails ![image](/uploads/8ecbabc65382214b8de63aae24f66cea/image.png) Based on: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/151 See merge request !4147
2016-05-19Fix creation of Ci::Commit object which can lead to pending, failed in some ↵Kamil Trzcinski
scenarios
2016-05-19Merge branch 'with-pipeline-view' into 'master' Douwe Maan
Add pipeline view This is continuation of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/3653 cc @DouweM @grzesiek Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/17551 Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/15625 See merge request !3703
2016-05-19Minor runner-related code refactoringsGrzegorz Bizon
2016-05-19Rename method that validates runner tag constrainsGrzegorz Bizon
2016-05-19Display validation errors when admin edits a runnerGrzegorz Bizon
2016-05-19Add minor corrections related to config of runnerGrzegorz Bizon
2016-05-19Move runner validator to separate private methodGrzegorz Bizon
2016-05-19Use form errors helper in CI runner edit formGrzegorz Bizon
2016-05-19Add method that check if build has tagsGrzegorz Bizon
2016-05-19Improve displaying validation messages for runnerGrzegorz Bizon
2016-05-19Add custom validator to runner modelGrzegorz Bizon
2016-05-19Disallow runner to pick untagged build if configuredGrzegorz Bizon
2016-05-19Extend runner config options for untagged jobsGrzegorz Bizon
2016-05-19Add form for runner config to run untagged jobsGrzegorz Bizon
2016-05-19Merge branch '12724-wrong-sorting-of-commit-order-in-mr-view' into 'master' Rémy Coutable
Resolve "Wrong sorting of commit order in MR view?" !4052 fixed this for the most obvious cases, but there were still some problems. Here's my test case: I have a branch where I was suffering from an unfortunate issue. Every other commit I made had its commit date set to one day before it should have been. (Perhaps my system clock was misbehaving.) ```shell for i in {1..10} do echo $i > $i git add $i GIT_COMMITTER_DATE=`date -v -$((i % 2))d` git commit -m $i done ``` The git CLI still gives me the commits in the right order, but I can see that the timestamps alternate between two values: ```shell $ git log --format='%h %ct %p %s' master...HEAD f0c3108 1463646313 3d38a13 10 3d38a13 1463559913 67f419b 9 67f419b 1463646313 74330c0 8 74330c0 1463559913 56361d7 7 56361d7 1463646313 ba1b60c 6 ba1b60c 1463559913 f91497d 5 f91497d 1463646313 79c5e57 4 79c5e57 1463559913 b953cef 3 b953cef 1463646313 12fc411 2 12fc411 1463559913 835715b 1 ``` Unfortunately, GitLab didn't like this _at all_. Here's what the commits on my MR from that branch looked like: ![image](/uploads/fdc38e932eeedcb77de9ec4b50ad1476/image.png) That's because we were sorting the commits by date, which is safe if they are in that order anyway. If they aren't, then because Ruby's sorting isn't stable, we lose even the ordering among the correctly-ordered commits with the same timestamp. After these changes (and reloading the MR's diff), this looks like: ![image](/uploads/b09fb0f51359c1c89484e713e859512b/image.png) The commits view was also wrong, but in a slightly different way. In table form: | View | Before | After | | --- | --- | --- | | Commit list | 10, 8, 6, 4, 2, 9, 7, 5, 3, 1 | 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 | | MR commits | 10, 2, 8, 4, 6, 5, 7, 3, 9, 1 | 10, 9, 8, 7, 6, 5, 4, 3, 2, 1 | Closes #12724 See merge request !4208
2016-05-19Merge branch 'deploy-key-alert-color' into 'master' Jacob Schatz
Fixed project settings alert colors In another MR, the class name was changed making all the alert messages have no background color ![Screen_Shot_2016-05-16_at_15.41.23](/uploads/58c9cb8016c4cdd0b7a02609554d3598/Screen_Shot_2016-05-16_at_15.41.23.png)![Screen_Shot_2016-05-16_at_15.41.15](/uploads/03e0a9f6d2b6c583cef79efbb3fc73cc/Screen_Shot_2016-05-16_at_15.41.15.png)![Screen_Shot_2016-05-16_at_15.41.31](/uploads/41481ab2a4069def0e44c4bb8784fbb3/Screen_Shot_2016-05-16_at_15.41.31.png) See merge request !4161
2016-05-19Merge branch 'project-variables-ui' into 'master' Jacob Schatz
Project variables UI ![Screen_Shot_2016-04-27_at_09.01.23](/uploads/cb9b1ac42aa734cfd3271c03dfaccc12/Screen_Shot_2016-04-27_at_09.01.23.png) ![Screen_Shot_2016-04-27_at_09.01.29](/uploads/4f317014d60f205a0e29497ad20f8a2e/Screen_Shot_2016-04-27_at_09.01.29.png) Closes #14091 See merge request !3942
2016-05-19Merge branch 'simplify-animation-css' into 'master' Jacob Schatz
Replace animate.css with a smaller subset of animations. As discussed in #15667. This saves ~50KB uncompressed. cc: @jschatz1 See merge request !3937
2016-05-19Merge branch 'mooreniemi/gitlab-ce-issue_15236' into 'master' Robert Speicher
Changing the confidentiality of an issue now creates a new system note Closes #15236. See merge request !4189
2016-05-19Revert "Merge branch 'issues/15127' into 'master'"Stan Hu
This reverts merge request !3647
2016-05-19Chunk commits by date in listsSean McGivern
It's possible to construct a commit graph where the output of `git log` isn't in timestamp order. Grouping the commits in the list by date then gives dramatically wrong results. Instead, go for the more pragmatic approach: use the commits in the order they're given, and just show the date line each time the date changes. This means that the same date header can show up multiple times, but at least the ordering is preserved.
2016-05-19Merge branch 'issues/15127' into 'master' Stan Hu
fix #15127 ActiveJob::DeserializationError thrown `send_devise_notification` pre-maturely enqueued the task when the user instance has not yet been committed into the database, causing a record-not-found in the other sidekiq process. `devise-async` has already been taking care of asynchronous mail sending, we just need to run it inside queue `mailers` instead of `mailer` to enable it. The implementation of `devise-async` enqueues the task in `after_commit` hook which is the right way to do it. See merge request !3647
2016-05-19Address Yorick's feedbackRémy Coutable
Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-19Merge remote-tracking branch 'origin/master' into ↵Rémy Coutable
eReGeBe/gitlab-ce-feature/milestone-md Signed-off-by: Rémy Coutable <remy@rymai.me>
2016-05-19Merge branch 'issue_17560' into 'master' Robert Speicher
Mask credentials from URL when the import of project has failed. REF: #17560 See merge request !4185