summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Improve clarity of variable names in ProjectTeam#fetch_invited_membersrs-simplify-fetch_membersRobert Speicher2016-09-201-14/+12
* Fix a logic error in ProjectTeam#fetch_invited_membersRobert Speicher2016-09-202-2/+3
* Simplify ProjectTeam#fetch_members to satisfy flogRobert Speicher2016-09-201-30/+40
* Add specs for ProjectTeam#fetch_membersRobert Speicher2016-09-202-0/+67
* Merge branch 'commit-notes-jump-to-button-remove' into 'master' Robert Speicher2016-09-202-1/+3
|\
| * Hide jump to next discussion button on commit notesPhil Hughes2016-09-202-1/+3
* | Merge branch 'rs-dry-akismet-service' into 'master' Rémy Coutable2016-09-201-27/+16
|\ \
| * | Reduce duplication in AkismetServicers-dry-akismet-serviceRobert Speicher2016-09-201-27/+16
* | | Merge branch 'lfs-support-for-ssh-enabled' into 'master' Douwe Maan2016-09-2013-8/+250
|\ \ \ | |_|/ |/| |
| * | Move logic to check ci? or lfs_deploy_token? to Gitlab::Auth::ResultKamil Trzcinski2016-09-203-12/+12
| * | Use early return in lfs_token_checkKamil Trzcinski2016-09-201-10/+10
| * | Fix test failureKamil Trzcinski2016-09-191-1/+1
| * | Revert "Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab...lfs-supportKamil Trzcinski2016-09-1913-3/+245
* | | Merge branch 'rs-trailing-spaces-in-regex-messages' into 'master' Rémy Coutable2016-09-201-3/+3
|\ \ \
| * | | Remove trailing spaces from messages in Gitlab::Regexrs-trailing-spaces-in-regex-messagesRobert Speicher2016-09-201-3/+3
| | |/ | |/|
* | | Merge branch 'sh-fix-last-activity-at-specs' into 'master' Rémy Coutable2016-09-203-11/+25
|\ \ \
| * | | Fix broken spec due to last_activity_at updates being throttledStan Hu2016-09-193-11/+25
* | | | Merge branch 'fix-download-artifacts-button-link' into 'master' Douwe Maan2016-09-206-5/+22
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'upstream/master' into fix-download-artifacts-bu...Lin Jen-Shin2016-09-2087-442/+2049
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge branch 'workhorse-0.8.2' into 'master' Douwe Maan2016-09-203-3/+3
|\ \ \ \ \
| * | | | | Use gitlab-workhorse 0.8.2Jacob Vosmaer2016-09-163-3/+3
* | | | | | Merge branch 'ldap_user_attr_method' into 'master' Douwe Maan2016-09-201-1/+5
|\ \ \ \ \ \
| * | | | | | Move LDAP user attributes to a methodDrew Blessing2016-09-151-1/+5
* | | | | | | Merge branch 'strip-key-comments-for-gitlab-shell' into 'master' Robert Speicher2016-09-203-6/+40
|\ \ \ \ \ \ \
| * | | | | | | Strip comments before sending keys to gitlab-shellJacob Vosmaer2016-09-163-6/+40
* | | | | | | | Merge branch '22065-group-members-api-returning-null-user-details' into 'mast...Robert Speicher2016-09-205-17/+27
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Better assertion in API members specs22065-group-members-api-returning-null-user-detailsRémy Coutable2016-09-161-1/+3
| * | | | | | | Ensure invitees are not returned in Members APIRémy Coutable2016-09-165-17/+25
* | | | | | | | Merge branch 'lint-for-changelog' into 'master' Robert Speicher2016-09-202-7/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix old CHANGELOG entrieswinniehell2016-09-191-7/+2
| * | | | | | | | Add linting for duplicate CHANGELOG versions (!6039)winniehell2016-09-191-0/+9
* | | | | | | | | Merge branch 'diff-table-width-fix' into 'master' Jacob Schatz2016-09-202-4/+6
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed large comments messing with diff table widthsdiff-table-width-fixPhil Hughes2016-09-122-4/+6
* | | | | | | | | | Merge branch 'fix-build-trace-anchors' into 'master' Jacob Schatz2016-09-201-2/+11
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Now anchors to the top or bottom of the build trace with the correct offsetfix-build-trace-anchorsLuke Bennett2016-09-092-8/+8
| * | | | | | | | | | trace step buttons now scroll 50px up or down at a timeLuke Bennett2016-09-092-4/+13
* | | | | | | | | | | Merge branch '21961-issues-filtering-issue-with-labels-that-contain-spaces' i...Jacob Schatz2016-09-204-11/+40
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into '21961-issues-filtering-issue-with-labels-that-con...21961-issues-filtering-issue-with-labels-that-contain-spacesLuke "Jared" Bennett2016-09-19229-1715/+3642
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge branch 'issue_20978' into 'master' Rémy Coutable2016-09-198-70/+117
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Allow to set request_access_enabled for groups and projects using APIFelipe Artur2016-09-198-70/+117
* | | | | | | | | | | | Contributing via GH no longer encouraged.Sid Sijbrandij2016-09-191-1/+1
* | | | | | | | | | | | Update README.md to really fix iconSid Sijbrandij2016-09-191-1/+1
* | | | | | | | | | | | Update README.md to fix iconSid Sijbrandij2016-09-191-1/+1
* | | | | | | | | | | | Merge branch 'sh-prevent-duplicate-protected-branches-on-push' into 'master' Rémy Coutable2016-09-193-1/+17
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Only create a protected branch upon a push to a new branch if a rule for that...sh-prevent-duplicate-protected-branches-on-pushStan Hu2016-09-173-1/+17
* | | | | | | | | | | | | Merge branch 'throttle-last-activity-at' into 'master' Rémy Coutable2016-09-193-13/+48
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Restrict last_activity_at updates to one per hourYorick Peterse2016-09-193-13/+48
* | | | | | | | | | | | | | Merge branch 'cs-add-cii-badge' into 'master' Rémy Coutable2016-09-191-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Add CII badge to README [ci skip]cs-add-cii-badgeConnor Shea2016-08-281-0/+1
* | | | | | | | | | | | | | | Merge branch 'per-build-token-without-lfs' into 'master' Rémy Coutable2016-09-1930-201/+985
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | |
View Lorry Controller Status