summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Streamline the "Report button"rymai/gitlab-ce-disable-report-button-if-already-reportedRémy Coutable2015-09-299-67/+27
* Disable the "Report abuse" button if a user has already been reportedRémy Coutable2015-09-297-9/+73
* Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDouwe Maan2015-09-2822-119/+444
|\
| * Merge branch 'projects'Dmitriy Zaporozhets2015-09-2822-119/+444
| |\
| | * !important removed from preAndrey2015-09-283-10/+5
| | * edit action allignAndrey2015-09-282-6/+6
| | * Project page UpdateAndrey2015-09-2512-195/+263
| | * Fix testsDmitriy Zaporozhets2015-09-251-2/+1
| | * UI changes to the project view, empty project and project list new project bu...Andrey2015-09-249-69/+373
* | | Merge branch 'fxposter/gitlab-ce-login-from-admin'Douwe Maan2015-09-286-0/+46
|\ \ \ | |/ / |/| |
| * | Add entry to changelogPavel Forkert2015-09-241-0/+1
| * | Clarify spec title explanationPavel Forkert2015-09-241-1/+1
| * | Remove stuff from previous UIPavel Forkert2015-09-241-1/+1
| * | Move login button to user page, switched to POST methodPavel Forkert2015-09-245-21/+27
| * | Add option to admin area to sign in as a specific userPavel Forkert2015-09-245-1/+40
* | | Merge branch 'add-activity-dashboard-preference' into 'master' Dmitriy Zaporozhets2015-09-286-5/+38
|\ \ \
| * | | Add user preference to view project activity and starred project activity as ...Stan Hu2015-09-266-5/+38
* | | | Merge pull request #9669 from aaronsnyder/admin-labels-grammarStan Hu2015-09-263-3/+4
|\ \ \ \
| * | | | Fix grammar in admin area labels .nothing-here-block when no labels exist.Aaron Snyder2015-09-263-3/+4
* | | | | Merge branch 'patch-1' into 'master' Stan Hu2015-09-261-3/+2
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Simplified sentence as per @stanhu's noteCyriac Thomas2015-09-261-1/+1
| * | | | Fixed grammar on Using Docker Build doc.Cyriac Thomas2015-09-261-3/+2
|/ / / /
* | | | Merge branch 'master' of https://github.com/gitlabhq/gitlabhqStan Hu2015-09-251-1/+1
|\ \ \ \
| * \ \ \ Merge pull request #9650 from szechyjs/fb-close-commentStan Hu2015-09-251-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | FogBugz Import: Closed comments may contain user dataJared Szechy2015-09-211-1/+1
* | | | | Merge branch 'rs-correct-markdown-doc' into 'master' Robert Speicher2015-09-251-2/+2
|\ \ \ \ \
| * | | | | Correct an inaccuracy in the Markdown docRobert Speicher2015-09-251-2/+2
|/ / / / /
* | | | | Merge branch 'rs-changelog' into 'master' Robert Speicher2015-09-252-299/+4
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Remove CHANGELOG-CIRobert Speicher2015-09-251-298/+0
| * | | | Add unreleased 8.0.3 entry to CHANGELOGRobert Speicher2015-09-251-1/+4
|/ / / /
* | | | Merge branch 'stanhu/gitlab-ce-fix-mr-creation-with-large-diffs'Dmitriy Zaporozhets2015-09-252-2/+3
|\ \ \ \
| * | | | Fix Error 500 in creating merge requests with > 1000 diffsStan Hu2015-09-252-2/+3
* | | | | Merge branch 'fix-stuck-forked-project-import' into 'master' Dmitriy Zaporozhets2015-09-254-2/+13
|\ \ \ \ \
| * | | | | Use after_commit_queue to schedule import job immediatelyStan Hu2015-09-253-5/+13
| * | | | | Fix bug where projects would appear to be stuck in the forked import stateStan Hu2015-09-252-1/+4
* | | | | | Merge branch 'unicorn-listen-8080' into 'master' Marin Jankovski2015-09-251-0/+13
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Make sure Unicorn listens on localhost:8080unicorn-listen-8080Jacob Vosmaer2015-09-251-0/+13
* | | | | | Merge branch 'handle-bad-head' into 'master' Dmitriy Zaporozhets2015-09-251-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fix Error 500 occuring with repositories that have a bad HEADStan Hu2015-09-241-1/+1
| |/ / / /
* | | | | Merge branch 'hook-api-updates' into 'master' Stan Hu2015-09-245-4/+38
|\ \ \ \ \
| * | | | | hooks: improve tests for hook APIBen Boeckel2015-09-242-1/+27
| * | | | | api: add enable_ssl_verification to PUT/POST hooksBen Boeckel2015-09-242-2/+6
| * | | | | doc: list note_events as a valid parameter for PUT/POST hooksBen Boeckel2015-09-241-0/+2
| * | | | | api: expose note_events and enable_ssl_verification for hooksBen Boeckel2015-09-242-1/+3
* | | | | | Merge branch 'get-ci-token-from-ci-projects' into 'master' Robert Speicher2015-09-244-5/+12
|\ \ \ \ \ \
| * | | | | | Test grace auth against gitlab_ci_project with tokenget-ci-token-from-ci-projectsKamil Trzcinski2015-09-241-1/+4
| * | | | | | Update stub syntaxRobert Speicher2015-09-241-1/+1
| * | | | | | Fix grack auth specKamil Trzcinski2015-09-241-1/+1
| * | | | | | Fix specsKamil Trzcinski2015-09-242-2/+2
| * | | | | | Remove unneeded changeKamil Trzcinski2015-09-241-1/+2
View Lorry Controller Status