summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Ensure raise_error expectations provide argumentsrs-fix-spec-warningsRobert Speicher2015-09-214-4/+8
* Merge branch 'rename-reply-by-email' into 'master' Robert Speicher2015-09-2117-175/+150
|\
| * Tweak textrename-reply-by-emailDouwe Maan2015-09-212-4/+4
| * Merge branch 'master' into rename-reply-by-emailDouwe Maan2015-09-2120-84/+266
| |\
| * | Rename reply_by_email to incoming_email to prepare for the future.Douwe Maan2015-09-2117-175/+151
* | | Merge branch 'ci-import-improvements' into 'master' Kamil Trzciński2015-09-212-2/+4
|\ \ \
| * | | Relax CI version check during importci-import-improvementsJacob Vosmaer2015-09-211-1/+3
| * | | Make importing builds less noisyJacob Vosmaer2015-09-211-1/+1
* | | | 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
| |/ / / / /
* | | | | | Fix grammarSytse Sijbrandij2015-09-211-2/+2
* | | | | | Merge branch 'fix-milestone-destroy-in-mr' into 'master' Dmitriy Zaporozhets2015-09-213-0/+12
|\ \ \ \ \ \
| * | | | | | Remove milestones from merge requests when milestones are deletedStan Hu2015-09-213-0/+12
| |/ / / / /
* | | | | | 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
| |/ / / / /
* | | | | | Merge branch 'ci-nav-commits-count' into 'master' Dmitriy Zaporozhets2015-09-211-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | 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
* | | | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | 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 th...Patricio Cano2015-09-165-15/+48
| * | | | | Added Spinach tests and updated CHANGELOGPatricio Cano2015-09-163-0/+21
| * | | | | 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 'ci-migrate-version-fix' into 'master' Marin Jankovski2015-09-211-4/+2
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | 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
|\ \ \ \ \ \
| * | | | | | 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
View Lorry Controller Status