summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'as-fix-changelog' into 'master' 18999-switch-labels-and-weightJacob Schatz2016-06-281-1/+0
|\
| * Fix CHANGELOGas-fix-changelogAlfredo Sumaran2016-06-281-1/+0
* | Merge branch 'fix/builds-api-builds-for-commit-search' into 'master' Rémy Coutable2016-06-284-15/+58
|\ \
| * | Remove redundant check in commit builds API endpointfix/builds-api-builds-for-commit-searchGrzegorz Bizon2016-06-281-2/+0
| * | Add documentation for commit builds API improvementsGrzegorz Bizon2016-06-281-0/+5
| * | Add Changelog entry for commit builds API fixGrzegorz Bizon2016-06-281-0/+1
| * | Improve commit builds API endpoint RESTful behaviorGrzegorz Bizon2016-06-282-16/+51
| * | Find all builds for commit if multiple pipelinesGrzegorz Bizon2016-06-282-5/+9
* | | Merge branch 'performance-clock-adjustments' into 'master' Robert Speicher2016-06-285-21/+48
|\ \ \
| * | | Use clock_gettime for all performance timestampsperformance-clock-adjustmentsYorick Peterse2016-06-285-21/+48
| | |/ | |/|
* | | Merge branch 'lbennett/gitlab-ce-2542-implement-updated-ui-for-new-project-pa...Jacob Schatz2016-06-285-106/+180
|\ \ \ | |/ / |/| |
| * | Wiped old page and started on new UIlbennett/gitlab-ce-2542-implement-updated-ui-for-new-project-pageLuke "Jared" Bennett2016-06-285-106/+180
* | | Merge branch 'remove-gon-variable' into 'master' Fatih Acet2016-06-282-1/+1
|\ \ \
| * | | Unused got variable with very bad performancePaco Guzman2016-06-282-1/+1
* | | | Merge branch 'iankelling-api-doc' into 'master' Achilleas Pipinellis2016-06-281-1/+1
|\ \ \ \
| * | | | docs: fix default_branch_protection defaultIan Kelling2016-06-051-1/+1
* | | | | Merge branch '19170-mobile-buttons' into 'master' Dmitriy Zaporozhets2016-06-289-15/+15
|\ \ \ \ \
| * | | | | Update CHANGELOGAlfredo Sumaran2016-06-281-3/+2
| * | | | | Switched mobile button icons to ellipsis and angleAnnabel Dunstone2016-06-289-15/+16
|/ / / / /
* | | | | Merge branch '19171-pinned-width' into 'master' Dmitriy Zaporozhets2016-06-283-2/+3
|\ \ \ \ \
| * | | | | Update CHANGELOG19171-pinned-widthAnnabel Dunstone2016-06-281-0/+1
| * | | | | Decreased window min width for pinned sidebarAnnabel Dunstone2016-06-282-2/+2
| | |/ / / | |/| | |
* | | | | Merge branch 'use-git-depth' into 'master' Kamil Trzciński2016-06-281-0/+1
|\ \ \ \ \
| * | | | | Use GIT_DEPTH when running buildsuse-git-depthKamil Trzcinski2016-06-171-0/+1
* | | | | | Merge branch 'add-smtp-upgrade-info' into 'master' Achilleas Pipinellis2016-06-281-0/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add SMTP upgrade informationStan Hu2016-06-281-0/+13
| | |_|/ / | |/| | |
* | | | | Merge branch 'gitlab_architecture' into 'master' Achilleas Pipinellis2016-06-283-1/+3
|\ \ \ \ \
| * | | | | Add "GitLab team members only" to diagram linkgitlab_architectureChris Wilson2016-06-281-1/+1
| * | | | | Update GitLab architecture diagram, include Google draw linkChris Wilson2016-06-232-0/+2
| * | | | | Replace GitLab architecture diagramAchilleas Pipinellis2016-04-133-1/+1
* | | | | | Merge branch 'display-deleted-ref-in-events' into 'master' Rémy Coutable2016-06-283-9/+19
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Display last commit of deleted branch in push events (!4699)winniehell2016-06-283-9/+19
* | | | | | Merge branch 'fix/attr-encrypted-issue' into 'master' Rémy Coutable2016-06-284-0/+6
|\ \ \ \ \ \
| * | | | | | add changelogJames Lopez2016-06-281-0/+3
| * | | | | | add missing attribute to attr_encrypted so it is fully backwards-compatibleJames Lopez2016-06-283-0/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge branch 'feature/custom-highlighting' into 'master' Rémy Coutable2016-06-2810-12/+101
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | doc: note that .gitattributes uses default branchfeature/custom-highlightinghttp://jneen.net/2016-06-271-0/+2
| * | | | | use the conf lexer so we have highlighted commentshttp://jneen.net/2016-06-271-1/+1
| * | | | | first draft of docshttp://jneen.net/2016-06-271-0/+29
| * | | | | support cgi style options, such as erb?parent=jsonhttp://jneen.net/2016-06-273-7/+18
| * | | | | move the path alias to a more appropriate locationhttp://jneen.net/2016-06-271-5/+5
| * | | | | make #custom_language privatehttp://jneen.net/2016-06-271-8/+8
| * | | | | appease rubocophttp://jneen.net/2016-06-271-2/+1
| * | | | | add an alias for Snippet#pathhttp://jneen.net/2016-06-271-0/+6
| * | | | | appease rubocophttp://jneen.net/2016-06-271-2/+2
| * | | | | check the tag so that an instance will pass toohttp://jneen.net/2016-06-271-1/+1
| * | | | | fix the spec, using project.change_headhttp://jneen.net/2016-06-272-3/+10
| * | | | | Revert "bump the master sha for gitlab-test!9"http://jneen.net/2016-06-271-1/+1
| * | | | | bump the master sha for gitlab-test!9http://jneen.net/2016-06-271-1/+1
| * | | | | add custom highlighting via .gitattributeshttp://jneen.net/2016-06-277-12/+47