summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add missing krb5 devel dependency when building packagesCyril Rohr2015-01-181-0/+3
|
* Merge pull request #8604 from Razer6/fix_gitlab_shell_docJeroen van Baarsen2015-01-182-2/+2
|\ | | | | Update gitlab-shell in docs to 2.4.1
| * Update gitlab-shell in docs to 2.4.1Robert Schilling2015-01-182-2/+2
|/
* Expand sidebar only for large devicesDmitriy Zaporozhets2015-01-171-2/+2
|
* Merge branch 'doorkeeper_applications_scafold'Dmitriy Zaporozhets2015-01-1711-6/+146
|\
| * Small improvements to CIDmitriy Zaporozhets2015-01-173-6/+12
| |
| * Application admin scaffoldValery Sizov2015-01-1711-5/+139
| |
* | Merge branch 'fix-commits-pagination' into 'master'Dmitriy Zaporozhets2015-01-172-1/+4
|\ \ | | | | | | | | | | | | | | | Fix commits pagination See merge request !1406
| * | Fix commits paginationDmitriy Zaporozhets2015-01-172-1/+4
| |/
* | Merge branch 'update_import_doc' into 'master'Job van der Voort2015-01-171-0/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | Update import doc Documentation update for #1900 See merge request !1405
| * | Update import.md documentation to specify correct directory ownership and ↵Marin Jankovski2015-01-161-0/+10
|/ / | | | | | | permissions.
* | Merge branch 'configure-home-page' into 'master'Dmitriy Zaporozhets2015-01-1710-12/+39
|\ \ | |/ |/| | | | | | | Allow to specify home page for non logged-in users See merge request !1404
| * Fix passign args to original authenticate_user!Dmitriy Zaporozhets2015-01-161-2/+2
| |
| * Validate application settings only if column existsDmitriy Zaporozhets2015-01-162-2/+7
| |
| * Add tests to home page url redirectDmitriy Zaporozhets2015-01-163-4/+7
| |
| * Allow to specify home page for non logged-in usersDmitriy Zaporozhets2015-01-168-9/+28
|/
* Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqDmitriy Zaporozhets2015-01-166-42/+43
|\
| * Merge branch 'mobile-fixes' into 'master'Dmitriy Zaporozhets2015-01-166-42/+43
| |\ | | | | | | | | | | | | | | | Mobile fixes See merge request !1403
| | * Fix broadcast message overflowDmitriy Zaporozhets2015-01-161-12/+8
| | |
| | * Remvoe unnecessary expand buttonsDmitriy Zaporozhets2015-01-152-12/+2
| | |
| | * Add some mobile fixes to UIDmitriy Zaporozhets2015-01-154-19/+34
| |/
* | Fix signup settingsDmitriy Zaporozhets2015-01-161-1/+1
| |
* | Fix testsDmitriy Zaporozhets2015-01-161-2/+2
|/
* Fix shell version in manual installation docDmitriy Zaporozhets2015-01-151-1/+1
|
* Better label for diffsDmitriy Zaporozhets2015-01-151-1/+1
|
* Re-order admin dashboardDmitriy Zaporozhets2015-01-151-63/+57
|
* Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-01-1523-64/+49
|\
| * Merge pull request #8568 from Sheigutn/masterDmitriy Zaporozhets2015-01-151-0/+1
| |\ | | | | | | Add support for colored header on Android Lollipop with Chrome
| | * Add support for colored header on Android Lollipop with ChromeSheigutn2015-01-131-0/+1
| | |
| * | Merge pull request #7987 from cirosantilli/get-instead-matchDmitriy Zaporozhets2015-01-151-2/+2
| |\ \ | | | | | | | | Replace match via get with get on routes
| | * | Replace match via get with get on routesCiro Santilli2014-12-291-2/+2
| | | |
| * | | Merge pull request #7925 from cirosantilli/unused-argumentsDmitriy Zaporozhets2015-01-153-4/+4
| |\ \ \ | | | | | | | | | | Remove or prepend underscore _ to unused method arguments
| | * | | Remove or prepend _ to unused method argumentsCiro Santilli2014-12-273-4/+4
| | |/ /
| * | | Merge pull request #7905 from cirosantilli/visible-falseDmitriy Zaporozhets2015-01-154-14/+3
| |\ \ \ | | | | | | | | | | Change always passing visible false tests.
| | * | | Change always passing visible true tests to false.Ciro Santilli2015-01-024-14/+3
| | | | |
| * | | | Merge pull request #7951 from cirosantilli/uniform-blob-editDmitriy Zaporozhets2015-01-153-22/+17
| |\ \ \ \ | | | | | | | | | | | | Make blob new and edit file editors more uniform
| | * | | | Make blob new and edit file editors more uniformCiro Santilli2014-12-303-22/+17
| | | | | |
| * | | | | Merge pull request #8096 from cirosantilli/regex-to-stringDmitriy Zaporozhets2015-01-1510-21/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | Replace regex methods by string ones since faster and more readable
| | * | | | | Replace regex methods by string ones since fasterCiro Santilli2014-12-2810-21/+21
| | | |_|/ / | | |/| | | | | | | | | | | | | | | and more readable.
| * | | | | Merge pull request #8430 from cirosantilli/simplify-ssh-fingerprint-regexDmitriy Zaporozhets2015-01-151-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Simplify SSH fingerprint regexp extraction
| | * | | | | Simplify SSH fingerprint regexp extractionCiro Santilli2014-12-281-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | [\d\h] is the same as \h
* | | | | | Increase font size for listsDmitriy Zaporozhets2015-01-155-6/+9
|/ / / / /
* | | | | Welcome to 7.8 :)Dmitriy Zaporozhets2015-01-152-1/+59
| | | | |
* | | | | Merge pull request #8425 from rumpelsepp/rougeDmitriy Zaporozhets2015-01-1534-760/+518
|\ \ \ \ \ | | | | | | | | | | | | Replace highlight.js with rouge-fork rugments
| * | | | | Fixed testsStefan Tatschner2015-01-153-3/+4
| | | | | |
| * | | | | Replace highlight.js with rouge-fork rugmentsStefan Tatschner2015-01-1531-743/+497
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I decided to create a fork of rouge as rouge lacks a HTML formatter with the required options such as wrapping a line with <span> tags. Furthermore I was not really convinced about the clarity of rouge's source code. Rugments 1.0.0beta3 for now only includes some basic linting and a new HTML formatter. Everything else should behave the same.
| * | | | | Updated gollum-libsStefan Tatschner2015-01-152-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I did this commit in an earlier revision of my pull request. As reverting this commit later caused failing tests I decided to include it again.
* | | | | | Merge branch 'send_checkout_sha_to_services' into 'master'Dmitriy Zaporozhets2015-01-153-54/+76
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Send checkout sha to services In case of tags it may be useful to have sha of commit this tag points to. So now web hooks and services get additional parameter `checkout_sha` See merge request !1400
| * | | | | | Test git builder over annotated tagDmitriy Zaporozhets2015-01-152-4/+8
| | | | | | |
| * | | | | | Send checkout sha for web hooks and servicesDmitriy Zaporozhets2015-01-152-52/+70
| |/ / / / /
View Lorry Controller Status