summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Time for 6.8.0preDmitriy Zaporozhets2014-03-261-1/+1
* Merge branch 'improve_at_mentions' into 'master'Dmitriy Zaporozhets2014-03-265-5/+44
|\
| * Add to changelog.Marin Jankovski2014-03-252-3/+6
| * Version 6.7.2Dmitriy Zaporozhets2014-03-252-1/+7
| * Correct identation, default value if note doesn't exist.Marin Jankovski2014-03-251-14/+16
| * Search within project.Marin Jankovski2014-03-251-3/+5
| * Extract sorting into a method.Marin Jankovski2014-03-252-9/+12
| * Include commits.Marin Jankovski2014-03-252-3/+24
| * Allow referencing an existing user.Marin Jankovski2014-03-251-2/+2
| * At mention participating users.Marin Jankovski2014-03-252-1/+3
* | Merge branch 'event-create-service' into 'master'Dmitriy Zaporozhets2014-03-2614-144/+200
|\ \
| * | Fix testsDmitriy Zaporozhets2014-03-252-13/+1
| * | Fix MR observerDmitriy Zaporozhets2014-03-251-3/+1
| * | Remove activity observer specsDmitriy Zaporozhets2014-03-251-61/+0
| * | Use EventCreateService for notes, merge requestsDmitriy Zaporozhets2014-03-255-24/+19
| * | Drop activity observer. User EventCreateService insteadDmitriy Zaporozhets2014-03-254-43/+7
| * | Add milestone observerDmitriy Zaporozhets2014-03-251-0/+13
| * | Collect all event creation logic in one place called EventCreateServiceDmitriy Zaporozhets2014-03-252-0/+159
* | | Merge branch 'refactor-author-id-of-changes' into 'master'Dmitriy Zaporozhets2014-03-2612-28/+12
|\ \ \ | |/ /
| * | Remove author_id_of_changes from specDmitriy Zaporozhets2014-03-251-5/+0
| * | Remove author_id_of_changes from appDmitriy Zaporozhets2014-03-2511-23/+12
* | | Merge branch 'define-feature-request' into 'master'Dmitriy Zaporozhets2014-03-252-3/+3
|\ \ \
| * | | More strict wording of the bug criteria.dosire2014-03-251-2/+2
| * | | Merge branch 'master' into define-feature-requestdosire2014-03-25287-1455/+2876
| |\ \ \ | |/ / / |/| | |
* | | | More compact event feed and projects listDmitriy Zaporozhets2014-03-252-2/+2
* | | | Revert "Clearfix on well-lists. Pages affected:"Dmitriy Zaporozhets2014-03-251-6/+0
| |_|/ |/| |
* | | Merge pull request #6374 from zzet/patch-10Dmitriy Zaporozhets2014-03-251-1/+1
|\ \ \
| * | | Update merge_request_observer_spec.rbAndrew Kumanyaev2014-02-211-1/+1
* | | | Merge pull request #6554 from tsigo/remove-sporkDmitriy Zaporozhets2014-03-254-61/+45
|\ \ \ \
| * | | | Remove --drb from .rspecRobert Speicher2014-03-241-1/+1
| * | | | Remove SporkRobert Speicher2014-03-243-60/+44
* | | | | Merge pull request #6577 from tombruijn/group_projects_clearfixDmitriy Zaporozhets2014-03-251-0/+6
|\ \ \ \ \
| * | | | | Clearfix on well-lists. Pages affected:Tom de Bruijn2014-03-201-0/+6
* | | | | | Merge pull request #6586 from abner/masterDmitriy Zaporozhets2014-03-254-0/+54
|\ \ \ \ \ \
| * | | | | | documentation for api method which get labels of a projectÁbner Silva de Oliveira2014-03-231-0/+26
| * | | | | | changed doc comment for get labels of a projectÁbner Silva de Oliveira2014-03-231-2/+4
| * | | | | | moving labels specs to projects_spec fileÁbner Silva de Oliveira2014-03-222-26/+13
| * | | | | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqÁbner Silva de Oliveira2014-03-2210-40/+54
| |\ \ \ \ \ \
| * | | | | | | added api method to return labels of a given projectÁbner Silva de Oliveira2014-03-213-0/+39
* | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-03-251-1/+1
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge pull request #5935 from nmoura/patch-1Jacob Vosmaer2014-03-251-1/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | Changed sudo by su -cNilton Moura2013-12-261-1/+1
* | | | | | | | | Add bottom margin to highlighed code block in comment/wikiDmitriy Zaporozhets2014-03-251-0/+4
|/ / / / / / / /
* | | | | | | | Use current_user for Notification#merge_mrDmitriy Zaporozhets2014-03-253-4/+4
* | | | | | | | Simplify run tests commandDmitriy Zaporozhets2014-03-251-6/+1
* | | | | | | | Merge branch 'humanize-over-titleize' into 'master'Dmitriy Zaporozhets2014-03-253-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix testsDmitriy Zaporozhets2014-03-251-1/+1
| * | | | | | | | Use humanize instead of titleize for MR title suggestionDmitriy Zaporozhets2014-03-242-2/+2
* | | | | | | | | Merge branch 'improve-archived-projects' into 'master'Dmitriy Zaporozhets2014-03-252-4/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add proper explanation to MR in archived projectsDmitriy Zaporozhets2014-03-242-4/+8