summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | Merge branch 'artem-forks/gitlab-ce-nginx-rel-url'Jacob Vosmaer2016-03-1710-58/+227
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Lets have CSS and logo inlineArtem Sidorenko2016-03-118-56/+208
| * | | | | | | | | Do not serve anything via nginx as we have workhorseArtem Sidorenko2016-03-112-2/+19
| | | | | * | | | | Bump Git version requirement to 2.7.4Douwe Maan2016-03-173-6/+9
| |_|_|_|/ / / / / |/| | | | | | | |
* | | | | | | | | Merge branch 'dropdown-preselect-value' into 'master' Robert Speicher2016-03-172-4/+21
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Moved code to single line ifPhil Hughes2016-03-171-4/+2
| * | | | | | | | Removed label/milestone helper methodsdropdown-preselect-valuePhil Hughes2016-03-162-20/+10
| * | | | | | | | Fixed failing testsPhil Hughes2016-03-161-1/+2
| * | | | | | | | Pre-selects values on issue and merge request dropdownPhil Hughes2016-03-162-4/+32
* | | | | | | | | Merge branch 'glalonde-triggerbuild' into 'master' Kamil Trzciński2016-03-173-1/+25
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | added changelog entryGeoffrey Lalonde2016-03-171-0/+1
| * | | | | | | | adjusted behavior so canceled builds tagged as allowed to fail do not fail buildGeoffrey Lalonde2016-03-172-1/+24
* | | | | | | | | Merge branch 'rm_duplicate_cache_ci_docs' into 'master' Achilleas Pipinellis2016-03-171-62/+48
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into rm_duplicate_cache_ci_docsAchilleas Pipinellis2016-03-17212-4709/+2860
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge duplicate cache entry in CI docsrm_duplicate_cache_ci_docsAchilleas Pipinellis2016-03-141-60/+48
* | | | | | | | | | Merge branch 'patch/refactor-post-receive' into 'master' Douwe Maan2016-03-172-27/+79
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Back-porting PostReceive refactor made for EE 🍺Gabriel Mazetto2016-03-172-27/+79
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | Merge branch '4009-external-users' into 'master' Douwe Maan2016-03-1723-80/+265
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add missing API docs on external userAchilleas Pipinellis2016-03-172-2/+3
| * | | | | | | | | | API support for setting External flag on existing usersZeger-Jan van de Weg2016-03-172-1/+9
| * | | | | | | | | | Refactor external users docsAchilleas Pipinellis2016-03-171-14/+18
| * | | | | | | | | | Merge branch 'master' into 4009-external-users4009-external-usersZeger-Jan van de Weg2016-03-15134-4265/+2169
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Doc external users featureZeger-Jan van de Weg2016-03-154-2/+21
| * | | | | | | | | | | Improve external users featureZeger-Jan van de Weg2016-03-144-6/+8
| * | | | | | | | | | | Merge branch 'master' into 4009-external-usersZeger-Jan van de Weg2016-03-1468-91/+964
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| * | | | | | | | | | | Create an external users tab on Admin user listZeger-Jan van de Weg2016-03-138-8/+57
| * | | | | | | | | | | Remove Project#publicishZeger-Jan van de Weg2016-03-132-8/+2
| * | | | | | | | | | | External UsersZeger-Jan van de Weg2016-03-1315-60/+171
* | | | | | | | | | | | Merge branch 'new-branch-button-issue' into 'master' Douwe Maan2016-03-1715-43/+238
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix specsZeger-Jan van de Weg2016-03-172-1/+2
| * | | | | | | | | | | | Merge branch 'master' into new-branch-button-issueZeger-Jan van de Weg2016-03-1789-448/+697
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / | | |/| | | | | | | | | |
| * | | | | | | | | | | | Incorporate the review and update specZeger-Jan van de Weg2016-03-155-21/+20
| * | | | | | | | | | | | Incorporate reviewZeger-Jan van de Weg2016-03-1510-27/+93
| * | | | | | | | | | | | Link in the note when started a new branch from an issueZeger-Jan van de Weg2016-03-151-1/+4
| * | | | | | | | | | | | Enhance new branch button on an issueZeger-Jan van de Weg2016-03-158-50/+99
| * | | | | | | | | | | | new-branch-buttonZeger-Jan van de Weg2016-03-1511-4/+81
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix_horizontal_overflow_in_code_tag' into 'master' Jacob Schatz2016-03-171-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added comment to make builds runJacob Schatz2016-03-171-0/+1
| * | | | | | | | | | | | fix horizontal overflow that occurs in the code tagArinde Eniola2016-03-161-0/+6
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'css-space-after-colon' into 'master' Jacob Schatz2016-03-1710-32/+32
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Follow the CSS Style Guide rules for including a space after the property colon.connorshea2016-03-1610-32/+32
* | | | | | | | | | | | | Merge branch 'fix/reuse-existing-no-cache-method' into 'master' Kamil Trzciński2016-03-172-13/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Reuse `no_cache_headers` method in badges controllerGrzegorz Bizon2016-03-172-13/+2
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'patch-1' into 'master' Robert Schilling2016-03-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix typo in README.md.Mark Pundsack2016-03-161-1/+1
| | |/ / / / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'fix_wiki_links' into 'master' Robert Speicher2016-03-175-4/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix wiki search results point to raw sourceHiroyuki Sato2016-03-175-4/+25
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge branch 'css-zero-unit-fix' into 'master' Jacob Schatz2016-03-1726-139/+140
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Follow the CSS Style Guide rules for unitless zero values.connorshea2016-03-1626-139/+140
|/ / / / / / / / / /
* | | | | | | | | | Merge branch 'danielcarraro/gitlab-ce-feature/omniauth-auth0-gem' into 'master' Robert Speicher2016-03-166-0/+101
|\ \ \ \ \ \ \ \ \ \