| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Sidekiq-cron configuration moved to gitlab.ymlfeature/sidekiq-cron-config | Gabriel Mazetto | 2015-12-14 | 4 | -15/+20 |
| | | |||||
| * | Merge branch 'fix-shared-runner-wording' into 'master' | Robert Speicher | 2015-12-12 | 1 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | Fix wording on "runners" page An attempt to be a bit more specific and clear on the "runners" page. [ci skip] See merge request !2066 | ||||
| | * | Fix wording on runner setup page | Pelle | 2015-12-12 | 1 | -2/+2 |
| | | | |||||
| * | | Merge branch 'requires-redis-2.6' into 'master' | Gabriel Mazetto | 2015-12-12 | 4 | -5/+22 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Bump Redis requirement to 2.8 for Sidekiq 4 GitLab Omnibus already uses Redis 2.8. There is also a plan to upgrade to Sidekiq 4, which needs Redis 2.8. Closes #3649 See merge request !1888 | ||||
| | * | | Bump Redis requirement to 2.8 for Sidekiq 4 requirements | Stan Hu | 2015-12-12 | 4 | -5/+22 |
| |/ / | | | | | | | | | | | Closes #3649 [ci skip] | ||||
| * | | Merge branch 'custom-saml-button-label' into 'master' | Achilleas Pipinellis | 2015-12-12 | 1 | -2/+3 |
| |\ \ | | | | | | | | | | | | | | | | | | | add details on how to change saml button label Instructions on how to customize SAML login button text. See merge request !2079 | ||||
| | * | | add details on how to change saml button label | Ben Bodenmiller | 2015-12-11 | 1 | -2/+3 |
| | | | | |||||
| * | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce | Stan Hu | 2015-12-11 | 1 | -0/+3 |
| |\ \ \ | |/ / | |||||
| | * | | Merge branch 'clarify_ci_caching' into 'master' | Achilleas Pipinellis | 2015-12-11 | 1 | -0/+3 |
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clarify cache behavior After chatting with @ayufan about CI caching, I added some info to the documentation. This should make it clear how caching currently works. cc/ @ayufan Is this accurate? See merge request !2072 | ||||
| | | * | | Clarify cache behavior | Drew Blessing | 2015-12-11 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Merge pull request #9839 from huacnlee/fix/add-author-info-into-note-messages | Stan Hu | 2015-12-11 | 1 | -0/+2 |
| |\ \ \ \ | |/ / / |/| | | | Make sure notify email always has author info. | ||||
| | * | | | Make sure notify email always has author info. | Jason Lee | 2015-11-18 | 1 | -0/+2 |
| | | | | | |||||
| * | | | | Merge branch 'ui-right-sidebar' into 'master' | Dmitriy Zaporozhets | 2015-12-11 | 20 | -298/+364 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implement new sidebar for issue and merge request pages This is first step in implementing #3981. We don't have new dropdowns yet so I used some workarounds. Also I did it from linux machine without having access to design materials. So some colors/paddings might not match - but I will improve it with next iteration. cc @creamzy @JobV See merge request !2058 | ||||
| | * | | | | Fix tests | Dmitriy Zaporozhets | 2015-12-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | Move awards back to gray panel and few improvements to sidebar | Dmitriy Zaporozhets | 2015-12-11 | 7 | -6/+7 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | Few UI improvements to new sidebar implementation | Dmitriy Zaporozhets | 2015-12-11 | 3 | -8/+13 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | Fix tests for new issuable sidebar | Dmitriy Zaporozhets | 2015-12-11 | 2 | -14/+30 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | Update changelog | Dmitriy Zaporozhets | 2015-12-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | Implement new sidebar for merge request page | Dmitriy Zaporozhets | 2015-12-11 | 10 | -92/+82 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | Make edit link on issuable sidebar works | Dmitriy Zaporozhets | 2015-12-11 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | Redesign issue page for new sidebar | Dmitriy Zaporozhets | 2015-12-11 | 6 | -198/+97 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | Move awards css to separate file | Dmitriy Zaporozhets | 2015-12-11 | 1 | -0/+68 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| | * | | | | Implement issuable sidebar partial | Dmitriy Zaporozhets | 2015-12-11 | 1 | -0/+80 |
| | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | ||||
| * | | | | | Merge branch 'fix-typo' into 'master' | Robert Speicher | 2015-12-11 | 1 | -1/+1 |
| |\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | Fix typo [ci skip] See merge request !2035 | ||||
| | * | | | | Fix typo | Zeger-Jan van de Weg | 2015-12-10 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Update CHANGELOG | Robert Speicher | 2015-12-11 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | [ci skip] | ||||
| * | | | | | Merge branch 'mr-statuses' into 'master' | Robert Speicher | 2015-12-11 | 6 | -1/+59 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display referenced merge request statuses in the issue description See gitlab-org/gitlab-ce#3180 for original issue. Previously discussed in !1941 and in !1771 before that. * [x] Show a "Related Merge Requests" list on the issue page under the Description as given by the UI mockup * [x] Display `all_references.merge_requests` and `note.all_references.merge_requests` * [x] Consider displaying the merge request status in addition to the CI status to enable complete merge request status understanding. See merge request !1991 | ||||
| | * | | | | | display referenced merge requests in issue description with CI statusgsmethells/gitlab-ce-mr-statuses | Greg Smethells | 2015-12-11 | 6 | -1/+59 |
| | | |_|/ / | |/| | | | |||||
| * | | | | | Merge branch 'revert-2037' into 'master' | Dmitriy Zaporozhets | 2015-12-11 | 4 | -2/+6 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert removal of RedCloth Revert !2037. See merge request !2071 | ||||
| | * | | | | | Revert "Merge branch 'remove-redcloth' into 'master' "revert-2037 | Douwe Maan | 2015-12-11 | 4 | -2/+6 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | This reverts commit e426c027b0a2a3aa0dea1d833008f2bfd814f483, reversing changes made to c3676aa156981092b7f03f1a3e74bb819cfa2fc3. | ||||
| * | | | | | Merge branch 'fix-delete-notes-on-merge-request-diff' into 'master' | Robert Speicher | 2015-12-11 | 4 | -8/+46 |
| |\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix delete notes on merge request diff Fixes #3971 See merge request !2061 | ||||
| | * | | | | [ci skip] Update CHANGELOGfix-delete-notes-on-merge-request-diff | Douglas Barbosa Alexandre | 2015-12-10 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Remove note from MR discussion when deleting it in the changes tab | Douglas Barbosa Alexandre | 2015-12-10 | 3 | -8/+45 |
| | | | | | | |||||
| * | | | | | Merge branch 'feature/project_js_from_ee' into 'master' | Douwe Maan | 2015-12-11 | 1 | -2/+5 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Aling project js with EE The MR ports the changes introduced by gitlab-org/gitlab-ee!70 in `project.js.coffee`. See merge request !2054 | ||||
| | * | | | | | Aling project js with EE | Borja Aparicio | 2015-12-10 | 1 | -2/+5 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'complexity/rubocop-metrics' into 'master' | Douwe Maan | 2015-12-11 | 10 | -156/+368 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enable rubocop metrics This enables rubocop metrics like CyclomaticComplexity and ABCSize. Initial threshold values are high, should be probably decreased. See merge request !1802 | ||||
| | * | | | | | | Mix url helpers in into `RepositoryPush` | Grzegorz Bizon | 2015-12-11 | 1 | -9/+10 |
| | | | | | | | | |||||
| | * | | | | | | Bump cyclomatic and perceived complexity threshold by one | Grzegorz Bizon | 2015-12-08 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Refactor CI YAML processor's validators | Grzegorz Bizon | 2015-12-08 | 2 | -29/+43 |
| | | | | | | | | |||||
| | * | | | | | | Check if commits are available in `RepositoryPush` | Grzegorz Bizon | 2015-12-08 | 1 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | Duplicate options in `RepositoryPush` | Grzegorz Bizon | 2015-12-08 | 1 | -4/+4 |
| | | | | | | | | |||||
| | * | | | | | | Move `common_mentionable_setup` to shared context in specs | Grzegorz Bizon | 2015-12-08 | 1 | -3/+3 |
| | | | | | | | | |||||
| | * | | | | | | Add `RepositoryPush` specs | Grzegorz Bizon | 2015-12-08 | 2 | -5/+127 |
| | | | | | | | | |||||
| | * | | | | | | Fix specs by adding forgotten instance variable | Grzegorz Bizon | 2015-12-08 | 1 | -0/+3 |
| | | | | | | | | |||||
| | * | | | | | | Fix url helpers in RepositoryPush | Grzegorz Bizon | 2015-12-08 | 1 | -3/+4 |
| | | | | | | | | |||||
| | * | | | | | | Remove obsolete variables in `repository_push_email` | Grzegorz Bizon | 2015-12-08 | 4 | -48/+46 |
| | | | | | | | | |||||
| | * | | | | | | Improve Messagee::RepositoryPush | Grzegorz Bizon | 2015-12-08 | 2 | -64/+68 |
| | | | | | | | | |||||
| | * | | | | | | Refactor RepositoryPush, move to Message namespace | Grzegorz Bizon | 2015-12-08 | 3 | -134/+140 |
| | | | | | | | | |||||
| | * | | | | | | Make `can_send_from_user_email?` public in Notify | Grzegorz Bizon | 2015-12-08 | 1 | -2/+2 |
| | | | | | | | | |||||
| | * | | | | | | Extract repository_push_email to separate class | Grzegorz Bizon | 2015-12-08 | 2 | -77/+135 |
| | | | | | | | | |||||
 |
index : delta/gitlab/gitlab-ce.git | |
| gitlab.com: gitlab-org/gitlab-ce.git |
| summaryrefslogtreecommitdiff |