summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'project-header' into 'master' Dmitriy Zaporozhets2016-07-055-296/+247
|\
| * Chnaged padding of project header navproject-headerPhil Hughes2016-07-052-3/+3
| * Reverted project avatar radiusPhil Hughes2016-07-042-1/+7
| * Fixed issue with Forked from text not being visiblePhil Hughes2016-07-041-9/+8
| * Mobile spacingPhil Hughes2016-07-041-2/+14
| * Updated spacingPhil Hughes2016-07-043-16/+22
| * Updated project headerPhil Hughes2016-07-046-293/+221
* | Merge branch 'rs-avatar_url-performance' into 'master' Stan Hu2016-07-053-3/+3
|\ \
| * | Dumb-down avatar presence check in `avatar_url` methodsRobert Speicher2016-07-053-3/+3
* | | Merge branch 'new-mr-commit-alignment' into 'master' Jacob Schatz2016-07-051-1/+2
|\ \ \ | |/ / |/| |
| * | Fixed avatar alignment in new MR viewPhil Hughes2016-07-051-1/+2
* | | Set user data in profile link in the headerDmitriy Zaporozhets2016-07-051-1/+1
* | | Fix profile test to click on header user profile linkDmitriy Zaporozhets2016-07-051-1/+1
* | | Remove current user link to the profile from sidebarDmitriy Zaporozhets2016-07-053-34/+2
* | | Add profile settings link to header user dropdowndz-add-profile-settings-linkDmitriy Zaporozhets2016-07-051-0/+2
|/ /
* | Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2016-07-042-2/+2
|\ \
| * \ Merge branch 'master' into dev-masterTomasz Maczukin2016-07-02155-327/+596
| |\ \
| * | | Ensure logged-out users can't see private refsSean McGivern2016-06-302-2/+2
* | | | Merge branch 'user-avatar-header' into 'master' Dmitriy Zaporozhets2016-07-043-15/+34
|\ \ \ \
| * | | | Updating padding in dropdown menuuser-avatar-headerPhil Hughes2016-06-291-4/+4
| * | | | Fixed logout testsPhil Hughes2016-06-281-1/+1
| * | | | Added user avatar to headerPhil Hughes2016-06-273-11/+30
* | | | | Merge branch 'more_descriptive_git_shell_messages' into 'master' Dmitriy Zaporozhets2016-07-041-1/+4
|\ \ \ \ \
| * | | | | Handle custom Git hook result in GitLab UIValery Sizov2016-07-041-1/+4
| | |_|_|/ | |/| | |
* | | | | Merge branch 'save-artifacts_sizes' into 'master' Rémy Coutable2016-07-041-1/+15
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Explicitly set to nil when artifacts don't exist:Lin Jen-Shin2016-07-041-0/+2
| * | | | Merge remote-tracking branch 'upstream/master' into save-artifacts_sizesLin Jen-Shin2016-07-04216-522/+1093
| |\ \ \ \
| * | | | | Use nil for non-existing files rather than 0Lin Jen-Shin2016-07-011-1/+3
| * | | | | Use AR callbacks as suggested by:Lin Jen-Shin2016-06-291-1/+5
| * | | | | Also remove ci_builds.artifacts_size when erasedLin Jen-Shin2016-06-281-0/+1
| * | | | | Just save the size in total rather than individual filesLin Jen-Shin2016-06-281-20/+6
| * | | | | Introduce ci_builds.artifacts_sizes as JSON:Lin Jen-Shin2016-06-281-1/+20
* | | | | | Better message for git hooks and file locksValery Sizov2016-07-044-8/+10
| |/ / / / |/| | | |
* | | | | Merge branch '13524-keep-around-commits' into 'master' Douwe Maan2016-07-048-5/+73
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Document Repository#keep_aroundDouwe Maan2016-07-041-4/+8
| * | | | Don't garbage collect commits that have related DB records like commentsDouwe Maan2016-07-048-5/+69
* | | | | Merge branch 'git-http-kerberos-ce' into 'master' Douwe Maan2016-07-012-4/+44
|\ \ \ \ \
| * | | | | Groundwork for Kerberos SPNEGO (EE feature)Jacob Vosmaer2016-07-012-4/+44
* | | | | | Merge branch 'explicit-requesters-scope' into 'master' Douwe Maan2016-07-0119-57/+75
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Exclude requesters from Project#members, Group#members and User#membersexplicit-requesters-scopeRémy Coutable2016-07-0119-57/+75
* | | | | | Merge branch 'rubocop/enable-cops-for-empty-lines' into 'master' Robert Speicher2016-07-0133-37/+0
|\ \ \ \ \ \
| * | | | | | Enable Style/EmptyLines cop, remove redundant onesrubocop/enable-cops-for-empty-linesGrzegorz Bizon2016-07-0133-37/+0
* | | | | | | Cache results from jQuery selectors to retrieve namespace nameDouglas Barbosa Alexandre2016-07-011-4/+7
* | | | | | | Fix import button when import fail due the namespace already been takenDouglas Barbosa Alexandre2016-07-012-2/+5
|/ / / / / /
* | | | | | Merge branch '19388-fix-snippets-notes-not-shown' into 'master' Rémy Coutable2016-07-011-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix snippets comments not displayed19388-fix-snippets-notes-not-shownRémy Coutable2016-07-011-1/+1
* | | | | | Merge branch 'todos-api' into 'master' Rémy Coutable2016-07-012-0/+32
|\ \ \ \ \ \
| * | | | | | Expose target, filter by state as stringRobert Schilling2016-07-011-0/+21
| * | | | | | Expose action_nameRobert Schilling2016-07-011-0/+11
| * | | | | | Move to helper, no instance variablesRobert Schilling2016-07-012-8/+1
View Lorry Controller Status