summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | Merge branch 'fix/deleted_file' into 'master'Dmitriy Zaporozhets2015-01-054-4/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | fix deleted file display when using new gitlab_git gem, and add new gitlab_gi...Arif Ali2014-12-304-4/+5
| * | | | | | | | | Merge branch 'fix-xmlns-namespacing-atom-feeds' into 'master'Dmitriy Zaporozhets2015-01-054-4/+4
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix xmlns:media namespacing for atom feedsJeremy Maziarz2014-12-314-4/+4
| * | | | | | | | | | Merge branch 'use_plural' into 'master'Robert Schilling2015-01-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
| | * | | | | | | | | Use plural instead of refering explicitly to male/female.Achilleas Pipinellis2015-01-051-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqJob van der Voort2015-01-061-2/+7
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge pull request #8534 from jvanbaarsen/fix-wonky-testsDmitriy Zaporozhets2015-01-051-2/+7
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | make sure the user.name is escapedJeroen van Baarsen2015-01-041-2/+7
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'doc/redis-session-cleanup' into 'master'Job van der Voort2015-01-062-0/+53
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Document Redis session cleanupJacob Vosmaer2015-01-062-0/+53
| |/ / / / / / / / /
* | | | | | | | | | Updated CHANGELOG to include changes for 7.5.1-3Patricio Cano2015-01-051-0/+7
|/ / / / / / / / /
* | | | | | | | | Merge pull request #8520 from cirosantilli/edit-blob-link-testsDmitriy Zaporozhets2015-01-033-0/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add tests for disabled blob edit button cases.Ciro Santilli2014-12-303-0/+28
* | | | | | | | | | Update CHANGELOGDmitriy Zaporozhets2015-01-031-5/+5
* | | | | | | | | | Merge pull request #8489 from yglukhov/wiki-md-previewDmitriy Zaporozhets2015-01-033-6/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Markdown preview in wikiyglukhov2014-12-293-6/+10
* | | | | | | | | | | Merge pull request #8528 from Razer6/fix_group_avatarDmitriy Zaporozhets2015-01-031-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Raise group avatar filesize limit to 200kb, fixes #8527Robert Schilling2015-01-021-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'improve-merge-widget' into 'master'Dmitriy Zaporozhets2014-12-303-23/+37
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | |
| * | | | | | | | | Fix testsDmitriy Zaporozhets2014-12-301-1/+1
| * | | | | | | | | Improve accept mr widget UIDmitriy Zaporozhets2014-12-302-22/+36
|/ / / / / / / / /
* | | | | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2014-12-301-2/+2
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge pull request #8513 from dblessing/fix_hipchatDmitriy Zaporozhets2014-12-301-2/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fix HipChat ServerDrew Blessing2014-12-291-2/+2
| | | |_|/ / / / / / | | |/| | | | | | |
* | | | | | | | | | Fix testsDmitriy Zaporozhets2014-12-302-5/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'merge-request-commits-view' into 'master'Dmitriy Zaporozhets2014-12-302-31/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated merge request commits viewStephan van Leeuwen2014-12-292-31/+2
| | |_|_|/ / / / / | |/| | | | | | |
| | | | | | | | * Add returned API messages updates to changelog.Marin Jankovski2015-01-071-1/+1
| | | | | | | | * Fix failing tests due to updates on the return messages.Marin Jankovski2015-01-075-10/+10
| | | | | | | | * Add a message when unable to save an object through api.Marin Jankovski2015-01-078-15/+15
| | | | | | | | * Fix api tests.Marin Jankovski2014-12-303-5/+6
| | | | | | | | * Forward the messages in api response.Marin Jankovski2014-12-306-8/+8
| | | | | | | | * Message for api files and groups.Marin Jankovski2014-12-303-5/+5
| | | | | | | | * Clearer message if adding comment to commit via api fails.Marin Jankovski2014-12-301-1/+1
| | | | | | | | * Update branch api not found messages to 'Branch not found'.Marin Jankovski2014-12-302-5/+6
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | Merge branch 'user_ssh_keys_on_admin' into 'master'Dmitriy Zaporozhets2014-12-3014-47/+149
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix the ssh keys test.Marin Jankovski2014-12-301-3/+1
| * | | | | | | Share the key table between admin and profile resources.Marin Jankovski2014-12-309-53/+47
| * | | | | | | Move user key manipulation in admin section to a separate controller.Marin Jankovski2014-12-306-29/+41
| * | | | | | | Add feature spec for user ssh keys on admin page.Marin Jankovski2014-12-292-0/+42
| * | | | | | | Reuse show page for user keys.Marin Jankovski2014-12-293-19/+24
| * | | | | | | Add user key actions to admins.Marin Jankovski2014-12-293-1/+52
* | | | | | | | Merge branch 'ajax-group-select' into 'master'Dmitriy Zaporozhets2014-12-306-5/+101
|\ \ \ \ \ \ \ \
| * | | | | | | | Group selectbox jsDmitriy Zaporozhets2014-12-301-0/+41
| * | | | | | | | Helper for ajax group selectboxDmitriy Zaporozhets2014-12-303-0/+50
| * | | | | | | | Add group filtering by name for APIDmitriy Zaporozhets2014-12-302-5/+10
|/ / / / / / / /
* | | | | | | | Merge branch 'inline-protected-branches' into 'master'Dmitriy Zaporozhets2014-12-291-13/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Inline protected branches listDmitriy Zaporozhets2014-12-291-13/+11
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Prevent content overflow for notesDmitriy Zaporozhets2014-12-291-0/+1
| |_|/ / / / / |/| | | | | |