summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Remove CI button from project home panelremove-project-panel-ci-buttonDouwe Maan2015-09-211-4/+0
* Merge branch 'notification-levels' into 'master' Douwe Maan2015-09-218-3/+105
|\
| * 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-16181-58/+6914
| |\
| * \ Merge branch 'master' into notification-levelsPatricio Cano2015-09-1698-441/+645
| |\ \
| * | | Added Global to the drop downs and updated the label of the button to show th...Patricio Cano2015-09-164-13/+46
| * | | Replaced `this` with `@` in the coffee file and added an arrow that clearly m...Patricio Cano2015-09-142-3/+4
| * | | Notification dropdown now shows currently active level, and also shows what t...Patricio Cano2015-09-144-10/+23
| * | | 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 consistentsh-fix-issue-2585Stan Hu2015-09-181-0/+4
* | | | | Merge branch 'optimize-ci-tags-migration' into 'master' Marin Jankovski2015-09-212-2/+2
|\ \ \ \ \
| * | | | | Change wordingoptimize-ci-tags-migrationKamil Trzcinski2015-09-212-2/+2
* | | | | | Merge branch 'fail-ci-builds-without-yml' into 'master' Dmitriy Zaporozhets2015-09-211-1/+1
|\ \ \ \ \ \
| * | | | | | Fail builds if no .gitlab-ci.yml is foundKamil Trzcinski2015-09-201-1/+1
| |/ / / / /
* | | | | | Merge branch 'fix-markdown-links-in-dashboard' into 'master' Douwe Maan2015-09-211-2/+2
|\ \ \ \ \ \
| * | | | | | Fix Markdown links not showing up in dashboard activity feedStan Hu2015-09-201-2/+2
* | | | | | | Merge branch 'reply-by-email-diff' into 'master' Robert Speicher2015-09-212-5/+15
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Fix reply by email for comments on a specific line in a diff/commit.reply-by-email-diffDouwe Maan2015-09-202-5/+15
* | | | | | | Merge branch 'fix-ci-link-on-project-page' into 'master' Kamil Trzciński2015-09-201-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix 500 when showing project page and there's no CI project presentfix-ci-link-on-project-pageKamil Trzcinski2015-09-181-1/+1
* | | | | | | Merge branch 'style-pagination' into 'master' Dmitriy Zaporozhets2015-09-204-10/+43
|\ \ \ \ \ \ \
| * | | | | | | Apply new design to paginationstyle-paginationDmitriy Zaporozhets2015-09-194-10/+43
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'ci-build-list' into 'master' Dmitriy Zaporozhets2015-09-2013-144/+180
|\ \ \ \ \ \ \
| * | | | | | | Cleanup GitLab CI UIci-build-listDmitriy Zaporozhets2015-09-1912-162/+132
| * | | | | | | Return callout css for CIDmitriy Zaporozhets2015-09-191-0/+45
| * | | | | | | Merge branch 'master' into ci-build-listDmitriy Zaporozhets2015-09-1916-141/+61
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | Add colors to build labelsDmitriy Zaporozhets2015-09-185-13/+57
| * | | | | | | Merge branch 'master' into ci-build-listDmitriy Zaporozhets2015-09-1879-167/+195
| |\ \ \ \ \ \ \
| * | | | | | | | Style CI project/build listDmitriy Zaporozhets2015-09-1811-46/+21
* | | | | | | | | Merge branch 'jwt' into 'master' Douwe Maan2015-09-201-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Removed format validationKirilll Zaitsev2015-09-191-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Bump devise-two-factor to 2.0.0rs-bump-two-factorRobert Speicher2015-09-192-2/+2
* | | | | | | | | Devise 3.5.x deprecates `confirm!` in favor of `confirm`Robert Speicher2015-09-191-1/+1
|/ / / / / / / /
* | | | | | | | Fix IssuableContext javascriptRobert Speicher2015-09-181-4/+5
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge branch 'ci_closer_integration' into 'master' Kamil Trzciński2015-09-186-79/+18
|\ \ \ \ \ \ \
| * | | | | | | remove API calls from CE to CIci_closer_integrationValery Sizov2015-09-186-79/+18
* | | | | | | | Fix gitlab ci projects page UIDmitriy Zaporozhets2015-09-181-9/+9
|/ / / / / / /
* | | | | | | Merge branch 'merge_request_error' into 'master' Dmitriy Zaporozhets2015-09-183-53/+8
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Fix CI status in the MR pageValery Sizov2015-09-183-53/+8
| | |/ / / / | |/| | | |
* | | | | | Allow to disable GitLab CIKamil Trzcinski2015-09-188-5/+30
|/ / / / /
* | | | | Merge branch 'add-custom-text-to-help' into 'master' Jeroen van Baarsen2015-09-183-0/+9
|\ \ \ \ \
| * | | | | Allow custom info to be added to Help pageJeroen van Baarsen2015-09-183-0/+9
| |/ / / /
* | | | | Merge branch 'fix-ci-non-public-project' into 'master' Dmitriy Zaporozhets2015-09-181-3/+1
|\ \ \ \ \