summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'rename-reply-by-email' into 'master' Robert Speicher2015-09-214-4/+10
|\
| * Merge branch 'master' into rename-reply-by-emailDouwe Maan2015-09-217-11/+21
| |\
| * | Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan2015-09-214-4/+10
* | | Merge branch 'fix-ci-handling' into 'master' Dmitriy Zaporozhets2015-09-212-3/+8
|\ \ \
| * | | Fixed MR handling when GitLab CI project is not presentfix-ci-handlingKamil Trzcinski2015-09-212-3/+8
* | | | Merge branch 'fix-note-edit-preview-css' into 'master' Robert Speicher2015-09-214-3/+7
|\ \ \ \
| * | | | More tweaks to make note edit/preview CSS consistentStan Hu2015-09-214-3/+7
* | | | | Merge branch 'fix-mr-without-refs' into 'master' Dmitriy Zaporozhets2015-09-212-1/+20
|\ \ \ \ \
| * | | | | Fetch merge request ref if it is missing when visit MR pagefix-mr-without-refsDmitriy Zaporozhets2015-09-212-1/+20
| |/ / / /
* | | | | Merge branch 'fix-milestone-destroy-in-mr' into 'master' Dmitriy Zaporozhets2015-09-211-0/+5
|\ \ \ \ \
| * | | | | Remove milestones from merge requests when milestones are deletedStan Hu2015-09-211-0/+5
| |/ / / /
| * | | | Revert "Fixed MR handling when GitLab CI project is not present"Kamil Trzcinski2015-09-212-8/+3
| * | | | Fixed MR handling when GitLab CI project is not presentKamil Trzcinski2015-09-212-3/+8
| |/ / /
* | | | Merge branch 'repo-size-link' into 'master' Dmitriy Zaporozhets2015-09-212-3/+3
|\ \ \ \
| * | | | 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 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.ci-nav-fwDouwe Maan2015-09-212-14/+14
| |/ / /
* | | | Use consistent styling for number of commits in CI nav sidebarci-nav-commits-countDouwe Maan2015-09-211-1/+1
|/ / /
* | | 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