summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ci/api-variables' into 'master' Douwe Maan2016-01-141-1/+5
|\
| * Merge branch 'master' into ci/api-variablesDouwe Maan2016-01-1424-106/+224
| |\
| * \ Merge branch '8-4-stable' into ci/api-variablesTomasz Maczukin2016-01-13229-889/+1394
| |\ \
| * | | Change :variable_id to :key as resource ID in APITomasz Maczukin2016-01-071-1/+5
| * | | Add features for list and show details of variables in APITomasz Maczukin2015-12-311-0/+1
* | | | Merge branch 'fix/titles-weight' into 'master' Douwe Maan2016-01-1411-9/+23
|\ \ \ \ | |_|_|/ |/| | |
| * | | Improve the consistency of commit titles, branch names, tag names, issue/MR t...fix/titles-weightRémy Coutable2016-01-1411-9/+23
| | |/ | |/|
* | | Merge branch 'feature/ldap-sync-edgecases' into 'master' Douwe Maan2016-01-147-12/+60
|\ \ \
| * | | fixed LDAP activation on login to use new ldap_blocked statefeature/ldap-sync-edgecasesGabriel Mazetto2016-01-141-0/+1
| * | | Fix Admin/Users view to position buttons without spacing magicGabriel Mazetto2016-01-142-15/+18
| * | | Codestyle changesGabriel Mazetto2016-01-121-1/+1
| * | | Code style fixes and some code simplifiedGabriel Mazetto2016-01-082-10/+12
| * | | Repair ldap_blocked state when no ldap identity exist anymoreGabriel Mazetto2016-01-084-0/+22
| * | | Prevent ldap_blocked users from being unblocked by the Admin UIGabriel Mazetto2016-01-083-2/+12
| * | | Add ldap_blocked as new state to users state machineGabriel Mazetto2016-01-081-1/+11
* | | | Merge branch 'fix-safe-import-url' into 'master' Douwe Maan2016-01-141-1/+1
|\ \ \ \
| * | | | Fix the undefinded variable error in Project's safe_import_url methodDJ Mountney2016-01-131-1/+1
| | |/ / | |/| |
* | | | Merge branch 'fix/private-references' into 'master' Douwe Maan2016-01-144-3/+11
|\ \ \ \
| * \ \ \ Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into fix/pri...Rémy Coutable2016-01-1330-56/+115
| |\ \ \ \ | | |/ / /
| * | | | Move complex view condition to a model methodRémy Coutable2016-01-132-1/+8
| * | | | Show referenced MRs & Issues only when the current viewer can access themRémy Coutable2016-01-133-3/+4
* | | | | Merge branch 'rs-broadcasts' into 'master' Douwe Maan2016-01-1410-81/+142
|\ \ \ \ \
| * | | | | Remove (invalid) timestamp formattingrs-broadcastsRobert Speicher2016-01-131-2/+2
| * | | | | Move `BroadcastMessage#status` to a helper since it's presentationalRobert Speicher2016-01-133-11/+11
| * | | | | Broadcast Messages can now be editedRobert Speicher2016-01-134-27/+48
| * | | | | Update BroadcastMessage modelRobert Speicher2016-01-131-1/+26
| * | | | | Update broadcast_message helperRobert Speicher2016-01-133-14/+15
| * | | | | Simplify broadcast message JSRobert Speicher2016-01-131-3/+4
| * | | | | Remove alert_type attribute from BroadcastMessageRobert Speicher2016-01-132-5/+7
| * | | | | Move broadcast message form to a partialRobert Speicher2016-01-133-34/+39
| * | | | | Style the broadcast message formRobert Speicher2016-01-133-6/+13
| * | | | | 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-132-0/+8
|\ \ \ \
| * | | | Make the metrics sampler interval configurableYorick Peterse2016-01-132-0/+8
* | | | | Merge branch 'fix/reference_filter_uri_decode_error_for_master' into 'master' Douwe Maan2016-01-132-6/+6
|\ \ \ \ \
| * | | | | Use CGI.escape instead of URI.escape, because URI is obsoleted.Jason Lee2016-01-122-6/+6
| | |/ / / | |/| | |
* | | | | Merge branch 'maintain-milestone-filter' into 'master' Douwe Maan2016-01-131-1/+1
|\ \ \ \ \
| * | | | | enable milestone filter to stickGreg Smethells2016-01-121-1/+1
* | | | | | Merge branch 'referenced-merge-requests' into 'master' Dmitriy Zaporozhets2016-01-136-8/+19
|\ \ \ \ \ \
| * | | | | | changes `$quote-gray` to `$secondary-text`referenced-merge-requestsJacob Schatz2016-01-122-2/+2
| * | | | | | makes message plural for multiple MRs and removes from loop. Duh.Jacob Schatz2016-01-123-5/+11
| * | | | | | merge request close message moved and merge request now refered by `!`.Jacob Schatz2016-01-125-6/+11
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'rs-block-user-before-removal' into 'master' Dmitriy Zaporozhets2016-01-132-4/+7
|\ \ \ \ \ \
| * | | | | | Block the reported user before destroying the recordrs-block-user-before-removalRobert Speicher2016-01-122-4/+7
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'rs-time_ago_with_tooltip-conversion' into 'master' Dmitriy Zaporozhets2016-01-131-1/+1
|\ \ \ \ \ \
| * | | | | | Make sure time_ago_with_tooltip is using a Time objectrs-time_ago_with_tooltip-conversionRobert Speicher2016-01-121-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'comment-and-close-button-does-not-submit-comment' into 'master' Dmitriy Zaporozhets2016-01-135-21/+37
|\ \ \ \ \ \
View Lorry Controller Status