summaryrefslogtreecommitdiff
path: root/app/views
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix/titles-weight' into 'master' Douwe Maan2016-01-145-7/+6
|\
| * Improve the consistency of commit titles, branch names, tag names, issue/MR t...fix/titles-weightRémy Coutable2016-01-145-7/+6
* | Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-141-10/+15
|\ \
| * | Fix Admin/Users view to position buttons without spacing magicGabriel Mazetto2016-01-141-15/+15
| * | Prevent ldap_blocked users from being unblocked by the Admin UIGabriel Mazetto2016-01-081-1/+6
* | | Merge branch 'fix/private-references' into 'master' Douwe Maan2016-01-141-0/+4
|\ \ \
| * \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into fix/pri...Rémy Coutable2016-01-1315-23/+45
| |\ \ \ | | | |/ | | |/|
| * | | Move complex view condition to a model methodRémy Coutable2016-01-131-1/+4
| * | | Show referenced MRs & Issues only when the current viewer can access themRémy Coutable2016-01-131-0/+1
* | | | Merge branch 'rs-broadcasts' into 'master' Douwe Maan2016-01-144-55/+69
|\ \ \ \
| * | | | Remove (invalid) timestamp formattingrs-broadcastsRobert Speicher2016-01-131-2/+2
| * | | | Move `BroadcastMessage#status` to a helper since it's presentationalRobert Speicher2016-01-131-1/+1
| * | | | Broadcast Messages can now be editedRobert Speicher2016-01-133-22/+31
| * | | | Update broadcast_message helperRobert Speicher2016-01-131-4/+1
| * | | | Move broadcast message form to a partialRobert Speicher2016-01-132-32/+38
| * | | | Style the broadcast message formRobert Speicher2016-01-132-6/+9
| * | | | Add js-requires-input to formRobert Speicher2016-01-131-3/+2
* | | | | Fix misaligned edit button in milestone collection partialrs-milestone-buttonsRobert Speicher2016-01-131-3/+4
* | | | | Update button styles for Milestones#showRobert Speicher2016-01-131-6/+6
| |_|/ / |/| | |
* | | | Added hint that you can search users by name, username, or email.Patricio Cano2016-01-132-2/+2
|/ / /
* | | Merge branch 'configure-randomize-metrics-sample-interval' into 'master' Yorick Peterse2016-01-131-0/+7
|\ \ \
| * | | Make the metrics sampler interval configurableYorick Peterse2016-01-131-0/+7
* | | | Merge branch 'referenced-merge-requests' into 'master' Dmitriy Zaporozhets2016-01-133-7/+8
|\ \ \ \
| * | | | makes message plural for multiple MRs and removes from loop. Duh.Jacob Schatz2016-01-122-4/+6
| * | | | merge request close message moved and merge request now refered by `!`.Jacob Schatz2016-01-123-6/+5
| |/ / /
* | | | Merge branch 'comment-and-close-button-does-not-submit-comment' into 'master' Dmitriy Zaporozhets2016-01-132-6/+4
|\ \ \ \
| * | | | gets merge request discussion working againcomment-and-close-button-does-not-submit-commentJacob Schatz2016-01-121-2/+2
| * | | | adds back in discussion.haml.html for issues commenting and closing/reopening...Jacob Schatz2016-01-121-4/+2
| * | | | removing last chunk of MR ajax changes, rest will be in another MRJacob Schatz2016-01-124-5/+7
| * | | | reverting more MR ajax files, will appear in different commitJacob Schatz2016-01-123-25/+30
| * | | | reverting _mr_title.html.hamlJacob Schatz2016-01-121-16/+10
| * | | | reverting _disscusionJacob Schatz2016-01-121-4/+5
| * | | | fixes conflictsJacob Schatz2016-01-1166-219/+337
| |\ \ \ \
| * | | | | initial json requests instead of HTMLJacob Schatz2016-01-076-33/+28
| * | | | | adds ajax open and close merges, with discussion/comments working as wellJacob Schatz2016-01-052-15/+20
| * | | | | adds ajax to bottom discussion buttons. Now submits issue and closes via ajax.Jacob Schatz2015-12-291-4/+2
* | | | | | Merge branch 'change_milestone_close_copy' into 'master' Dmitriy Zaporozhets2016-01-121-1/+1
|\ \ \ \ \ \
| * | | | | | Revert group milestone copychange_milestone_close_copyJosh Frye2016-01-121-1/+1
| * | | | | | Change milestone close notice copy. Closes #6051Josh Frye2016-01-112-2/+2
* | | | | | | Merge branch 'improve_more_buttons' into 'master' Jacob Schatz2016-01-123-4/+4
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Improve admin area button styleDrew Blessing2016-01-113-4/+4
* | | | | | | Merge branch 'show-ip-addresses' into 'master' Dmitriy Zaporozhets2016-01-121-0/+16
|\ \ \ \ \ \ \
| * | | | | | | Add user's last used IP addresses to admin pageStan Hu2016-01-121-0/+16
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge branch 'improve_button_styles' into 'master' Dmitriy Zaporozhets2016-01-122-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Improve button stylesDrew Blessing2016-01-082-3/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'hover-descriptions' into 'master' Dmitriy Zaporozhets2016-01-121-5/+9
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | adds hover titles to merge request and issue pageshover-descriptionsJacob Schatz2016-01-111-5/+9
| | |/ / / | |/| | |
* | | | | Merge branch 'fix/ci-linter-sequence-validations' into 'master' Robert Speicher2016-01-111-3/+3
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Allow subsequent validations in CI Linterfix/ci-linter-sequence-validationsGrzegorz Bizon2016-01-111-3/+3
* | | | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2016-01-111-5/+4
|\ \ \ \ \
View Lorry Controller Status