summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Fix: ci projects orderci_projects_orderValery Sizov2015-09-176-94/+71
* Merge branch 'enable_ssl_by_default' into 'master'Valery Sizov2015-09-171-1/+1
|\
| * enable SSL by defaultenable_ssl_by_defaultValery Sizov2015-09-171-1/+1
* | Merge branch 'fix-ci-500-on-settings' into 'master'Dmitriy Zaporozhets2015-09-171-1/+1
|\ \
| * | Fix 500 on CI project settingsfix-ci-500-on-settingsKamil Trzcinski2015-09-161-1/+1
| |/
* | Merge branch 'fix-public-projects' into 'master'Dmitriy Zaporozhets2015-09-171-5/+0
|\ \
| * | Fix displaying public projectsfix-public-projectsKamil Trzcinski2015-09-161-5/+0
* | | Fix HTML link that was improperly escaped in new user e-mailStan Hu2015-09-161-1/+1
| |/ |/|
* | Merge branch 'fix-ci-nav' into 'master'Dmitriy Zaporozhets2015-09-165-10/+4
|\ \ | |/ |/|
| * Fix confusing behaviour of back link in CI sidebarDmitriy Zaporozhets2015-09-165-10/+4
* | Merge branch 'style-ci-page' into 'master'Dmitriy Zaporozhets2015-09-164-21/+56
|\ \
| * | Style CI projects page and builds listDmitriy Zaporozhets2015-09-164-21/+56
| |/
* | Merge branch 'fix-issue-2555' into 'master'Dmitriy Zaporozhets2015-09-163-3/+3
|\ \ | |/ |/|
| * Eliminate combined image_tag and image_path in providers listStan Hu2015-09-161-1/+1
| * Fix default avatars to ensure that helpers don't have /assets dir appendedStan Hu2015-09-162-2/+2
* | Merge branch 'add-links-to-ci' into 'master'Dmitriy Zaporozhets2015-09-163-0/+10
|\ \
| * | Add links from GitLab to CIDmitriy Zaporozhets2015-09-163-0/+10
| |/
* | Fix CI testsKamil Trzcinski2015-09-161-1/+1
* | Fix ordering issueKamil Trzcinski2015-09-161-1/+1
* | Fix projects editKamil Trzcinski2015-09-161-1/+1
|/
* Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree...ci-and-ce-sitting-in-a-tree-k-i-s-s-i-n-gKamil Trzcinski2015-09-161-0/+1
|\
| * Merge pull request #9634 from allistera/users-autocomplete-sort-orderStan Hu2015-09-151-0/+1
| |\
| | * Sorted autocomplete users list by nameAllister Antosik2015-09-151-0/+1
* | | Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree...Kamil Trzcinski2015-09-159-65/+72
|\ \ \ | |/ /
| * | Merge branch 'fix-upload-ui' into 'master'Stan Hu2015-09-159-65/+72
| |\ \
| | * | Change the replace placeholder to use the filenamefix-upload-uiStan Hu2015-09-156-52/+50
| | * | Improve wording for header and placeholdersRobert Schilling2015-09-153-7/+7
| | * | Cleanup some html/css for upload featureDmitriy Zaporozhets2015-09-156-18/+27
| | |/
* | | Merge remote-tracking branch 'origin/master' into ci-and-ce-sitting-in-a-tree...Kamil Trzcinski2015-09-1586-342/+671
|\ \ \ | |/ /
| * | Merge branch 'slack-help-text' into 'master'Drew Blessing2015-09-151-0/+6
| |\ \ | | |/ | |/|
| | * Add a help text to the Slack ServiceJeroen van Baarsen2015-09-151-0/+6
| * | Use fixed version of fogbugz gemJared Szechy2015-09-151-5/+3
| |/
| * Merge branch 'fix_empty_project' into 'master'Dmitriy Zaporozhets2015-09-151-1/+1
| |\
| | * Fix empty project UIDrew Blessing2015-09-141-1/+1
| * | Merge branch 'import-in-progress-fix' into 'master'Dmitriy Zaporozhets2015-09-151-2/+6
| |\ \
| | * | Display "Forking in Progress" when importing a forked projectStan Hu2015-09-151-2/+5
| | * | Don't display "git clone --bare <URL>" if no URL is availableStan Hu2015-09-151-1/+2
| * | | Merge branch 'ui-fixes' into 'master'Dmitriy Zaporozhets2015-09-156-27/+49
| |\ \ \ | | |/ / | |/| |
| | * | Fix UI for web editorDmitriy Zaporozhets2015-09-153-4/+20
| | * | Fix last push widgetDmitriy Zaporozhets2015-09-153-23/+29
| * | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-09-159-9/+158
| |\ \ \ | | |/ / | |/| |
| | * | Merge pull request #9138 from liyakun/masterStan Hu2015-09-149-9/+158
| | |\ \
| | | * | Add "Replace" and "Upload" featuresliyakun2015-09-159-10/+159
| * | | | Improve project settings button on profileDmitriy Zaporozhets2015-09-151-2/+2
| |/ / /
| * | | Add current_ref helper methodheader-titlesDmitriy Zaporozhets2015-09-144-7/+9
| * | | Remove repeating titles on members and label pagesDmitriy Zaporozhets2015-09-143-30/+29
| * | | Add page titles to header for group and projectDmitriy Zaporozhets2015-09-146-20/+67
| * | | Merge branch 'public_profiles' into 'master'Dmitriy Zaporozhets2015-09-146-46/+54
| |\ \ \
| | * | | Hide search panel for group page if you dont have accesspublic_profilesDmitriy Zaporozhets2015-09-142-2/+6
| | * | | Fix tests and improve wordingDmitriy Zaporozhets2015-09-141-2/+1
View Lorry Controller Status