summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Whatevertest-gitlab-gitAhmad Sherif2016-08-172-7/+13
|
* Merge branch '17932-move-to-project-dropdown-improve' into 'master' Yorick Peterse2016-08-178-112/+340
|\ | | | | | | | | Move to project dropdown with infinite scroll for better performance See merge request !5828
| * Move to project dropdown with infinite scroll for better performance17932-move-to-project-dropdown-improvePaco Guzman2016-08-178-112/+340
|/ | | | | | | | Use just SQL to check is a user can admin_issue on a project Tradeoff - we duplicate how we check admin_issue in a SQL relation in the Ability class
* Merge branch 'label-flash' into 'master' Jacob Schatz2016-08-172-5/+10
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix error message for existing labels in right sidebar. ## What does this MR do? Fixes flash notification in right sidebar, if we want to create an existing label. ## Are there points in the code the reviewer needs to double check? Nope. ## Why was this MR needed? Because it was broken. ## What are the relevant issue numbers? Fixes #20117 ## Screenshots (if relevant) #### Before ![https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1fa7e98d1a3f0daaf8197809bbb26d0/Screen_Shot_2016-07-22_at_11.33.35.png](https://gitlab.com/gitlab-org/gitlab-ce/uploads/c1fa7e98d1a3f0daaf8197809bbb26d0/Screen_Shot_2016-07-22_at_11.33.35.png) #### After ![Screen_Shot_2016-07-28_at_13.38.03](/uploads/1dca73bf4c1b14c0044952a5032d9325/Screen_Shot_2016-07-28_at_13.38.03.png) ![Screen_Shot_2016-07-28_at_13.41.18](/uploads/9b814f7f03d0314050659e1ac6ace290/Screen_Shot_2016-07-28_at_13.41.18.png) ## 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 - [ ] ~~Added for this feature/bug~~ - [x] All builds are passing - [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 you do - rebase it please) - [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) See merge request !5546
| * Fix error message for existing labels.label-flashFatih Acet2016-08-112-5/+10
| |
* | Merge branch 'no-comment-button-on-discussion-diffs' into 'master' Jacob Schatz2016-08-171-1/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't show comment button in gutter of diffs on MR discussion tab When browsing to an MR, switching to the Changes tab, and switching back to the Discussions tab, the gutter of the diffs on that page would show the comment button on-hover, while it shouldn't, since comments on new lines can only be created from the Changes tab. ![Screen_Shot_2016-07-25_at_22.01.11](/uploads/6b044e1a3ecb34ddaa0af432833473aa/Screen_Shot_2016-07-25_at_22.01.11.png) `8-10-stable` counterpart at https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5493 See merge request !5492
| * | Don't show comment button in gutter of diffs on MR discussion tabno-comment-button-on-discussion-diffsDouwe Maan2016-07-251-1/+1
| | |
* | | Merge branch 'doc-update-akismet' into 'master' Patricio Cano2016-08-162-4/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Updated Akismet documentation Updated Akismet documentation See merge request !5821
| * | | Updated Akismet documentationPatricio Cano2016-08-162-4/+4
| | | |
* | | | Update CHANGELOG for 8.10.6, 8.9.7, and 8.8.8Robert Speicher2016-08-161-2/+12
| | | | | | | | | | | | | | | | [ci skip]
* | | | Merge branch 'todos-hover-state' into 'master' Jacob Schatz2016-08-163-14/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add hover state to todos ## What does this MR do? - Add a hover state to todos like for repository files. - Fix button alignment in todos - Add link to avatar in todos ## Are there points in the code the reviewer needs to double check? The `border-collapse` part—is there any better way? ## Why was this MR needed? Make hover states consistent. ## What are the relevant issue numbers? fixes #19833 ## Screenshots ### Before ![before](/uploads/cd2e7b234bf08fac48aebb60cdfa26a9/before.png) ### After ![todos-list](/uploads/592457050cb3ff2c43dfcce78418c50b/todos-list.png) ![todos-list-last-hover](/uploads/532714333bc74d1656a5c767012b4cdd/todos-list-last-hover.png) ![todos-mobile](/uploads/d542b04ddebc9d4354d57151dd04c0d2/todos-mobile.png) See merge request !5361
| * | | | Add hover state to todos (!5361)winniehell2016-08-163-14/+49
|/ / / /
* | | | Merge branch 'project-desc-width' into 'master' Jacob Schatz2016-08-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed project description width ## What does this MR do? Changes the width of the project description to a max of `700px` ## What are the relevant issue numbers? Closes #20020 ## Screenshots (if relevant) ![Screen_Shot_2016-07-21_at_12.51.59](/uploads/567f5b11553b45baa7fb07156e46b727/Screen_Shot_2016-07-21_at_12.51.59.png) See merge request !5397
| * | | | Changed project description widthproject-desc-widthPhil Hughes2016-07-211-1/+1
| | | | | | | | | | | | | | | | | | | | Closes #20020
* | | | | Merge branch 'project-list-icons-width' into 'master' Jacob Schatz2016-08-161-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed width on project visibility icon in project list ## What does this MR do? Gives fixed width to the project visibility icons in the project list so that they all correctly line up with each other. ## What are the relevant issue numbers? Closes #19583 ## Screenshots (if relevant) ![Screen_Shot_2016-07-07_at_12.49.58](/uploads/bffa097c5c0e0a1339bbd4d7ea15d84f/Screen_Shot_2016-07-07_at_12.49.58.png) See merge request !5137
| * | | | | Fixed width on project visibility icon in project listproject-list-icons-widthPhil Hughes2016-07-072-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Closes #19583
* | | | | | Merge branch 'pipeline-hooks-without-slack' into 'master' Robert Speicher2016-08-1650-111/+609
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement pipeline hooks, extracted from !5525 Closes #20115 See merge request !5620
| * \ \ \ \ \ Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into ↵Kamil Trzcinski2016-08-16107-436/+1984
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | pipeline-hooks-without-slack
| * | | | | | | Revert unrelevant changespipeline-hooks-without-slackKamil Trzcinski2016-08-163-22/+18
| | | | | | | |
| * | | | | | | Make rubocop happyKamil Trzcinski2016-08-151-9/+9
| | | | | | | |
| * | | | | | | Merge branch 'fix-failing-tests' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1531-221/+853
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1558-131/+619
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1326-50/+237
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make explicit call for all event types for ProjectHook factoryKamil Trzcinski2016-08-121-9/+7
| | | | | | | | | | |
| * | | | | | | | | | Capitalise URL on web_hooks/formKamil Trzcinski2016-08-121-8/+8
| | | | | | | | | | |
| * | | | | | | | | | Remove changes not related to this MRKamil Trzcinski2016-08-123-5/+1
| | | | | | | | | | |
| * | | | | | | | | | Added documentation for pipeline hooksKamil Trzcinski2016-08-121-0/+168
| | | | | | | | | | |
| * | | | | | | | | | Rename queue to enqueue in testsKamil Trzcinski2016-08-124-7/+11
| | | | | | | | | | |
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-128-34/+39
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix test failuresKamil Trzcinski2016-08-122-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Make pipeline to be in created state for hooks testsKamil Trzcinski2016-08-121-1/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Make `execute_methods` publicKamil Trzcinski2016-08-121-2/+2
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'improve-pipeline-processing' into pipeline-hooks-without-slackKamil Trzcinski2016-08-1242-329/+545
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/ci/pipeline.rb # app/models/commit_status.rb # app/services/ci/create_pipeline_service.rb # spec/models/ci/pipeline_spec.rb
| * | | | | | | | | | | | Fix tests. We cannot reload unless it's already saved:Lin Jen-Shin2016-08-121-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not sure if this is the right fix... Or maybe we should actually merge: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5782
| * | | | | | | | | | | | Have trait all_events_enabled so that's easier to reuse, feedback:Lin Jen-Shin2016-08-122-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13823349
| * | | | | | | | | | | | Simplify the name for data builder, feedback:Lin Jen-Shin2016-08-1232-63/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13671791
| * | | | | | | | | | | | Prefer extend self over module_function, feedback:Lin Jen-Shin2016-08-124-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13672004 https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13810498
| * | | | | | | | | | | | Make it more grammatically correct, feedback:Lin Jen-Shin2016-08-121-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13811203
| * | | | | | | | | | | | if -> when; when -> `when`; %w() -> %w[]; and fix some typos:Lin Jen-Shin2016-08-121-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13810945
| * | | | | | | | | | | | Prefer described_class, feedback:Lin Jen-Shin2016-08-123-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13810811 And other similar places.
| * | | | | | | | | | | | Make the comment more clear, feedback:Lin Jen-Shin2016-08-121-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13810778
| * | | | | | | | | | | | Fix tests for pipeline eventsKamil Trzcinski2016-08-112-18/+50
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix pipeline status change from pending to runningKamil Trzcinski2016-08-113-1/+53
| | | | | | | | | | | | |
| * | | | | | | | | | | | Enhance a pipeline event tests to analyse number of returned buildsKamil Trzcinski2016-08-112-22/+25
| | | | | | | | | | | | |
| * | | | | | | | | | | | Remove stage parameter from send payloadKamil Trzcinski2016-08-113-5/+5
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge remote-tracking branch 'origin/master' into pipeline-hooks-without-slackKamil Trzcinski2016-08-11102-2578/+3048
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # app/models/ci/pipeline.rb # app/services/ci/create_pipeline_service.rb # spec/models/project_services/hipchat_service_spec.rb
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into pipeline-hooks-without-slackLin Jen-Shin2016-08-11591-5159/+8109
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream/master: (233 commits) Fix awardable button mutuality loading spinners Update CHANGELOG for 8.10.5 Clean up project destruction Small refactor of doc/development/README.md Avoid commit lookup on diff_helper Removed extra newline from redis_spec.rb Used cached value of project count to reduce DB load Remove duplicate link_to statements Mention add_column_with_default in downtime guide Add missing space to generic badge template Rename `run` task helper method to prevent conflict with StateMachine Add a method in Project to return a cached value of total count of projects spellcheck Add svg guidelines to ui guide Add Changelog entry for Grape upgrade [ci skip] Fix Grape tests. Retain old behavior Update Grape from 0.13.0 to 0.15.0. adds second batch of tests changed to active tense fixes part1 of files to start using active tense ...
| * | | | | | | | | | | | | | Let's make sure cache were cleared:Lin Jen-Shin2016-08-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I can't reproduce this failure locally. Here's the failure: https://gitlab.com/gitlab-org/gitlab-ce/builds/2864250
| * | | | | | | | | | | | | | We still need to skip loading config_processor if skip_ci?Lin Jen-Shin2016-08-051-1/+1
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | No need to check that as in CreateCommitBuildsService:Lin Jen-Shin2016-08-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feedback: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/5620#note_13581358