summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* We now support resolving conflicts with ambiguous markersmerge-conflicts-editorDouwe Maan2016-09-201-1/+0
* Merge branch 'master' into merge-conflicts-editorDouwe Maan2016-09-20805-7583/+16034
|\
| * 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
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Solve code review commentsKamil Trzcinski2016-09-192-1/+10
| | * | | | | | | | | | Properly support Gitlab::Auth::ResultKamil Trzcinski2016-09-192-8/+8
| | * | | | | | | | | | Revert all changes introduced by https://gitlab.com/gitlab-org/gitlab-ce/merg...Kamil Trzcinski2016-09-1913-245/+3
| | * | | | | | | | | | Move Gitlab::Auth.Result to separate fileKamil Trzcinski2016-09-192-14/+17
| | * | | | | | | | | | Added CHANGELOGKamil Trzcinski2016-09-191-0/+1
| | * | | | | | | | | | Merge branch 'master' into per-build-tokenKamil Trzcinski2016-09-19150-1176/+1674
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Fix spec failuresKamil Trzcinski2016-09-192-2/+2
| | * | | | | | | | | | Support pushing via SSHKamil Trzcinski2016-09-192-1/+12
| | * | | | | | | | | | Don't leak build tokens in build logsKamil Trzcinski2016-09-195-15/+113
| | * | | | | | | | | | Fix permissions for creating container imagesKamil Trzcinski2016-09-191-1/+1
| | * | | | | | | | | | Improve authentication_result usageKamil Trzcinski2016-09-162-13/+20
| | * | | | | | | | | | Fix specs for available statusesKamil Trzcinski2016-09-161-2/+2
| | * | | | | | | | | | Simplify checking of allowed abilities in git_http_client_controllerKamil Trzcinski2016-09-164-59/+60
| | * | | | | | | | | | Improve code commentsKamil Trzcinski2016-09-163-4/+4
| | * | | | | | | | | | Merge remote-tracking branch 'origin/lfs-support-for-ssh' into per-build-tokenKamil Trzcinski2016-09-160-0/+0
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Refactored authentication code to make it a bit clearer, added test for wrong...lfs-support-for-sshPatricio Cano2016-09-156-38/+52
| | * | | | | | | | | | | Added missing LFS specsKamil Trzcinski2016-09-161-22/+213
| | * | | | | | | | | | | Fix specs after renaming authentication_capabilitiesKamil Trzcinski2016-09-163-14/+16
| | * | | | | | | | | | | Rename capabilities to authentication_abilitiesKamil Trzcinski2016-09-1611-62/+74
| | * | | | | | | | | | | Added builds_spec and git_http_specsKamil Trzcinski2016-09-154-20/+130
| | * | | | | | | | | | | Fix specs after merging LFS changesKamil Trzcinski2016-09-153-8/+36
| | * | | | | | | | | | | Merge remote-tracking branch 'origin/lfs-support-for-ssh' into per-build-tokenKamil Trzcinski2016-09-1532-112/+585
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Refactored authentication code to make it a bit clearer, added test for wrong...Patricio Cano2016-09-156-38/+50
| | | |/ / / / / / / / / /