summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Added ability to update or set the identity of an existing user, like the ↵fix-user-identities-apiPatricio Cano2015-09-222-0/+25
| | | | documentation said it was possible, but actually wasn't.
* Merge branch 'fix-milestone-destroy-in-mr' into 'master' Dmitriy Zaporozhets2015-09-213-0/+12
|\ | | | | | | | | | | | | | | | | | | | | Remove milestones from merge requests when milestones are deleted Destroying a milestone does not remove it from existing merge requests. This MR fixes that. Requires f4816372 to pull in as well. Reported by https://github.com/gitlabhq/gitlabhq/issues/9643 See merge request !1348
| * Remove milestones from merge requests when milestones are deletedStan Hu2015-09-213-0/+12
| | | | | | | | Reported by https://github.com/gitlabhq/gitlabhq/issues/9643
* | Merge branch 'repo-size-link' into 'master' Dmitriy Zaporozhets2015-09-212-3/+3
|\ \ | | | | | | | | | | | | | | | | | | Link project repo size to files See merge request !1374
| * | Link project repo size to filesrepo-size-linkDouwe Maan2015-09-212-3/+3
| | |
* | | Merge branch 'remove-project-panel-ci-button' into 'master' Dmitriy Zaporozhets2015-09-211-4/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove CI button from project home panel Since we already have a "Continuous Integration" item in the sidebar now, I don't think we need "CI" on the project page. See merge request !1372
| * | | Remove CI button from project home panelremove-project-panel-ci-buttonDouwe Maan2015-09-211-4/+0
| |/ /
* | | Merge branch 'ci-nav-fw' into 'master' Dmitriy Zaporozhets2015-09-212-14/+14
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Use fixed-width icons in CI nav sidebar. See merge request !1376
| * | | Use fixed-width icons in CI nav sidebar.ci-nav-fwDouwe Maan2015-09-212-14/+14
| |/ /
* | | Merge branch 'ci-nav-commits-count' into 'master' Dmitriy Zaporozhets2015-09-211-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use consistent styling for number of commits in CI nav sidebar Before: ![Screen_Shot_2015-09-21_at_15.00.28](https://gitlab.com/gitlab-org/gitlab-ce/uploads/9005f606842936d415a3b67890b8af88/Screen_Shot_2015-09-21_at_15.00.28.png) After: ![Screen_Shot_2015-09-21_at_15.00.43](https://gitlab.com/gitlab-org/gitlab-ce/uploads/08c897b65f82fab5f2c386a0d21c64af/Screen_Shot_2015-09-21_at_15.00.43.png) See merge request !1375
| * | Use consistent styling for number of commits in CI nav sidebarci-nav-commits-countDouwe Maan2015-09-211-1/+1
| |/
* | Revert "Fixed MR handling when GitLab CI project is not present"Kamil Trzcinski2015-09-212-8/+3
| | | | | | | | This reverts commit 3abcab779ec3015914eda5d715b4a9588445d815.
* | Fixed MR handling when GitLab CI project is not presentKamil Trzcinski2015-09-212-3/+8
|/
* Merge branch 'notification-levels' into 'master' Douwe Maan2015-09-2111-3/+126
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notification levels can now be set on the Project's main page ![Screen_Shot_2015-09-16_at_7.49.49_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0ac517bdfdc801f0e2115463c3ea9e10/Screen_Shot_2015-09-16_at_7.49.49_PM.png) The notification settings for a project can now be set directly on the Project's page. The drop down list and the button label reflect the current level. Saving is done via a remote form submission and if successful shows the user a flash message: ![Screen_Shot_2015-09-16_at_6.09.02_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/8a6e1fde5177aa3976cadf59fdb8d375/Screen_Shot_2015-09-16_at_6.09.02_PM.png) @DouweM can you please review my code. I gave my bestest effort to make in clean and readable. @rspeicher hopefully we can include it with the 8.0 release, maybe? /cc @darby See merge request !1322
| * Minor code cleanupnotification-levelsDouwe Maan2015-09-203-24/+23
| |
| * Use the `find_by_user_id` magic finder instead of `where`.Patricio Cano2015-09-161-1/+1
| |
| * Updated label from `Mention` to `On Mention`.Patricio Cano2015-09-161-1/+1
| |
| * Merge branch 'master' into notification-levelsPatricio Cano2015-09-16389-571/+17165
| |\
| * \ Merge branch 'master' into notification-levelsPatricio Cano2015-09-16133-551/+1050
| |\ \
| * | | Added Global to the drop downs and updated the label of the button to show ↵Patricio Cano2015-09-165-15/+48
| | | | | | | | | | | | | | | | the current level instead of `Notifications`
| * | | Added Spinach tests and updated CHANGELOGPatricio Cano2015-09-163-0/+21
| | | |
| * | | Replaced `this` with `@` in the coffee file and added an arrow that clearly ↵Patricio Cano2015-09-142-3/+4
| | | | | | | | | | | | | | | | marks the Notifications button as a drop down
| * | | Notification dropdown now shows currently active level, and also shows what ↵Patricio Cano2015-09-144-10/+23
| | | | | | | | | | | | | | | | the actual value of `global` is, if the project has the notification level set to global.
| * | | Corrected `case` indentation to conform with RubocopPatricio Cano2015-09-141-22/+22
| | | |
| * | | Added spacing to icons in Notification drop downPatricio Cano2015-09-141-4/+4
| | | |
| * | | Notification level can now be saved from within the project view.Patricio Cano2015-09-146-21/+32
| | | |
| * | | Fixed notification level list item helper.Patricio Cano2015-09-141-12/+8
| | | |
| * | | PAtrially working notification buttonDarby2015-09-144-0/+49
| | | |
* | | | Merge branch 'sh-fix-issue-2585' into 'master' Dmitriy Zaporozhets2015-09-211-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make Markdown area formatting consistent Issue #2585 See merge request !1354
| * | | | Make Markdown area formatting consistentsh-fix-issue-2585Stan Hu2015-09-181-0/+4
| | | | |
* | | | | Merge branch 'ci-migrate-version-fix' into 'master' Marin Jankovski2015-09-211-4/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use GitlabCi::VERSION when checking migration See merge request !1368
| * | | | | Use GitlabCi::VERSION when checking migrationKamil Trzcinski2015-09-211-4/+2
|/ / / / /
* | | | | Merge branch 'optimize-ci-tags-migration' into 'master' Marin Jankovski2015-09-217-73/+191
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CI migration rake task for GitLab CE - Uses backup format for final GitLab CI 8.0 - Highly optimized tags migration SQL queries See merge request !1365
| * | | | | Use INSERT INTO to insert tagsKamil Trzcinski2015-09-211-7/+8
| | | | | |
| * | | | | Change wordingoptimize-ci-tags-migrationKamil Trzcinski2015-09-212-2/+2
| | | | | |
| * | | | | Disable CI for time of migrationKamil Trzcinski2015-09-211-0/+13
| | | | | |
| * | | | | Change notices during migratingKamil Trzcinski2015-09-211-2/+2
| | | | | |
| * | | | | Create CI migration task on GitLab sideKamil Trzcinski2015-09-204-40/+152
| | | | | |
| * | | | | Use pure SQL queries to migrate CI tagsKamil Trzcinski2015-09-201-33/+25
| | | | | |
* | | | | | Merge branch 'fail-ci-builds-without-yml' into 'master' Dmitriy Zaporozhets2015-09-213-1/+15
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fail ci builds without yml Fix for https://gitlab.com/gitlab-org/gitlab-ce/issues/2551 See merge request !1349
| * | | | | | Rubocop fixfail-ci-builds-without-ymlKamil Trzcinski2015-09-201-1/+1
| | | | | | |
| * | | | | | Fail builds if no .gitlab-ci.yml is foundKamil Trzcinski2015-09-203-1/+15
| |/ / / / /
* | | | | | Merge branch 'fix-markdown-links-in-dashboard' into 'master' Douwe Maan2015-09-213-2/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Markdown links not showing up in dashboard activity feed Closes #2586 See merge request !1353
| * | | | | | Fix Markdown links not showing up in dashboard activity feedStan Hu2015-09-203-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #2586
* | | | | | | Merge branch 'reply-by-email-diff' into 'master' Robert Speicher2015-09-215-7/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix reply by email for comments on a specific line in a diff/commit. Fixes #2363. See merge request !1364
| * | | | | | | Fix reply by email for comments on a specific line in a diff/commit.reply-by-email-diffDouwe Maan2015-09-205-7/+24
| | | | | | | |
* | | | | | | | Merge branch 'gmail_actions_doc' into 'master' Job van der Voort2015-09-203-1/+23
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Gmail actions button for GitLab doc. Resolves #1517 by adding doc with some notes. See merge request !1327
| * | | | | | | Update the link in integration readme.gmail_actions_docMarin Jankovski2015-09-171-1/+1
| | | | | | | |
| * | | | | | | Remove double png.Marin Jankovski2015-09-171-1/+1
| | | | | | | |
| * | | | | | | Add Gmail actions button for GitLab doc.Marin Jankovski2015-09-172-0/+22
| | | | | | | |
View Lorry Controller Status