summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fixed failing password testsPhil Hughes2016-03-021-1/+1
* Password settings pagePhil Hughes2016-03-022-34/+28
* Merge branch 'profile-settings-ui' into 'master' Jacob Schatz2016-03-028-102/+118
|\
| * Changed link colour to matchPhil Hughes2016-03-022-7/+2
| * Changed weight of labelsprofile-settings-uiPhil Hughes2016-03-021-1/+1
| * Fixed heading weightPhil Hughes2016-03-021-1/+1
| * Profile settingsPhil Hughes2016-03-026-101/+122
* | Merge branch 'add_show_role_boolean_to_group_member_view' into 'master' Robert Speicher2016-03-021-1/+2
|\ \
| * | Only show group member roles if explicitly requestedDrew Blessing2016-03-011-1/+2
* | | Merge branch 'fix/13781-delete-tag-without-ajax' into 'master' Rémy Coutable2016-03-022-1/+9
|\ \ \
| * | | Make the tags delete button remote in the tags listfix/13781-delete-tag-without-ajaxRémy Coutable2016-03-013-2/+10
| * | | Tag deletion doesn't use AJAX anymoreRémy Coutable2016-03-011-1/+1
* | | | Merge branch 'fix/13785-dashboard-projects-display-welcome-after-search' into...Douwe Maan2016-03-023-4/+4
|\ \ \ \
| * | | | Use the .nothing-here-block class when projects list is emptyfix/13785-dashboard-projects-display-welcome-after-searchRémy Coutable2016-03-021-1/+1
| * | | | Don't show "Welcome to GitLab" when the search didn't return any projectsRémy Coutable2016-03-022-3/+3
* | | | | Merge branch 'username-issue-header' into 'master' Jacob Schatz2016-03-022-0/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Added username to issue & merge request headerusername-issue-headerPhil Hughes2016-03-012-0/+2
| | |/ / | |/| |
* | | | Merge branch 'fix/deprecated-ci-badge-permissions' into 'master' Douwe Maan2016-03-021-0/+2
|\ \ \ \
| * | | | Do not require authentication for CI status badgefix/deprecated-ci-badge-permissionsGrzegorz Bizon2016-03-011-1/+0
| * | | | Fix deprecated CI build status badge permissionsGrzegorz Bizon2016-03-011-0/+3
* | | | | Merge branch 'issue_13623' into 'master' Douwe Maan2016-03-024-14/+15
|\ \ \ \ \
| * | | | | Little refactor for milestone_remaining_days helper from last code review.issue_13623Rubén Dávila2016-03-012-6/+4
| * | | | | Show days remaining instead of elapsed time for Milestone.Rubén Dávila2016-03-014-14/+17
* | | | | | Merge branch 'issue_13716' into 'master' Douwe Maan2016-03-022-23/+31
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Add some specs for Repository#revert.issue_13716Rubén Dávila2016-03-011-1/+1
| * | | | | Check for conflicts before creating target branch.Rubén Dávila2016-03-012-23/+31
| |/ / / /
* | | | | Merge branch 'shortcuts-help' into 'master' Rémy Coutable2016-03-021-1/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix help keyboard shortcut for relative URL setupsArtem Sidorenko2016-03-011-1/+3
| | |/ / | |/| |
* | | | Merge branch 'logged-out-search' into 'master' Robert Speicher2016-03-018-43/+40
|\ \ \ \ | |/ / / |/| | |
| * | | Refactor UI header for logged out usersDmitriy Zaporozhets2016-03-013-47/+28
| * | | Enable search for logged-out usersDmitriy Zaporozhets2016-03-016-6/+22
| | |/ | |/|
* | | Merge branch 'login-flash' into 'master' Dmitriy Zaporozhets2016-03-011-0/+4
|\ \ \
| * | | Add bottom margin for flash container on login pageDmitriy Zaporozhets2016-03-011-0/+4
| |/ /
* | | Merge branch 'sidebar-overlap-fix' into 'master' Dmitriy Zaporozhets2016-03-013-3/+3
|\ \ \
| * | | Fix issue with overlap of sidebar links.Jacob Schatz2016-03-013-3/+3
| |/ /
* | | Merge branch 'rs-avatar-validation' into 'master' Douwe Maan2016-03-011-1/+1
|\ \ \
| * | | Only validate avatar cropping values when avatar is present AND changedrs-avatar-validationRobert Speicher2016-02-291-1/+1
* | | | Merge branch 'rs-fix-user-namespace_uniq' into 'master' Douwe Maan2016-03-011-1/+2
|\ \ \ \ | |/ / /
| * | | Properly check for a pre-existing error in `User#namespace_uniq`rs-fix-user-namespace_uniqRobert Speicher2016-02-291-1/+2
| | |/ | |/|
* | | Merge branch 'rs-improve-grace-period' into 'master' Douwe Maan2016-03-012-10/+13
|\ \ \ | |_|/ |/| |
| * | Don't show any "2FA required" message if it's not actually requiredrs-improve-grace-periodRobert Speicher2016-02-291-5/+7
| * | Reset `otp_grace_period_started_at` after disabling 2FARobert Speicher2016-02-291-5/+6
| * | Revert "Merge branch 'issue_5854' into 'master' "revert-6f85eb38Dmitriy Zaporozhets2016-02-291-4/+2
| * | Merge branch 'issue_5854' into 'master' Dmitriy Zaporozhets2016-02-291-2/+4
| |\ \
| | * | Add commit message to JIRA's notification payload.Rubén Dávila2016-02-261-2/+4
* | | | Merge branch 'mr-prefix-activity-view' into 'master' Jacob Schatz2016-03-015-6/+6
|\ \ \ \
| * | | | Changed page titlePhil Hughes2016-03-011-1/+1
| * | | | Fixed issue based on feedback with link text outputPhil Hughes2016-03-011-1/+1
| * | | | Removed un-used variablesPhil Hughes2016-03-012-3/+1
| * | | | Replaced prefix with to_reference method callsPhil Hughes2016-03-014-11/+6