summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'update-mr-branch-text' into 'master'Douwe Maan2015-08-041-2/+4
|\
| * Update merge request text to reflect editability of source/target branchStan Hu2015-08-031-2/+4
* | Merge branch 'add-license'Dmitriy Zaporozhets2015-08-034-8/+68
|\ \ | |/ |/|
| * Merge branch 'master' into add-licenseadd-licenseDouwe Maan2015-07-312-4/+9
| |\
| * | Fix method name.Douwe Maan2015-07-301-1/+1
| * | Show buttons to add license, changelog and contribution guide if they're miss...Douwe Maan2015-07-303-7/+67
* | | Merge branch 'master' of github.com:gitlabhq/gitlabhqStan Hu2015-08-025-3/+34
|\ \ \
| * | | Re-annotate modelsAtsushi Ishida2015-08-035-3/+34
* | | | Make `code` elements in links display as suchrs-code-linksRobert Speicher2015-07-312-1/+5
|/ / /
* | | Merge branch 'mention-name-in-flash-msg' into 'master'Douwe Maan2015-07-312-7/+7
|\ \ \
| * | | Raise alert when group is deleted.Achilleas Pipinellis2015-07-301-1/+1
| * | | Mention group and project name in flash messages upon create, update and delete.Achilleas Pipinellis2015-07-302-7/+7
* | | | Merge branch 'admin-group-member' into 'master' Douwe Maan2015-07-316-20/+33
|\ \ \ \ | |_|_|/ |/| | |
| * | | Use before_actionsDouwe Maan2015-07-312-4/+7
| * | | Restore Leave button on dashboard groups pageadmin-group-memberDouwe Maan2015-07-291-4/+3
| * | | Show Leave button when you're the last owner, so that the error explains the ...Douwe Maan2015-07-281-1/+1
| * | | Disable adding members from admin area when appropriateDouwe Maan2015-07-281-16/+18
| * | | Add specific ability for managing group membersDouwe Maan2015-07-285-7/+16
* | | | Merge branch 'api-new-attributes' into 'master' Robert Speicher2015-07-302-4/+9
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fix Projectapi-new-attributesDouwe Maan2015-07-301-1/+1
| * | | No more web urlDouwe Maan2015-07-303-12/+1
| * | | Fix specsDouwe Maan2015-07-291-1/+1
| * | | Merge branch 'master' into api-new-attributesDouwe Maan2015-07-295-8/+15
| |\ \ \
| * | | | Use URL helpersDouwe Maan2015-07-293-4/+5
| * | | | Add project star and fork count, group avatar URL and user/group web URL attr...Douwe Maan2015-07-282-0/+15
| | |/ / | |/| |
* | | | Merge branch 'fix-single-quote-in-network-graph' into 'master'Douwe Maan2015-07-302-3/+7
|\ \ \ \
| * | | | Fix network graph when branch name has single quotesStan Hu2015-07-292-3/+7
| | |_|/ | |/| |
* | | | Merge branch 'ssh-key-form' into 'master' Job van der Voort2015-07-301-4/+3
|\ \ \ \
| * | | | Switched the otder of the SSH key formssh-key-formDarby2015-07-291-4/+3
* | | | | Check that project was actually created rather than just validated in import:...Stan Hu2015-07-291-2/+2
| |/ / / |/| | |
* | | | Added tags to disable autocapitalize and autocorrect on login fieldDaryl Chan2015-07-291-1/+1
| |_|/ |/| |
* | | Merge pull request #9341 from rumpelsepp/rougeStan Hu2015-07-282-6/+6
|\ \ \
| * | | Add HTMLGitlab formatterStefan Tatschner2015-07-291-1/+1
| * | | Replace Rugments with RougeStefan Tatschner2015-07-292-6/+6
* | | | Merge branch 'rs-issue-2107' into 'master' Robert Speicher2015-07-281-1/+3
|\ \ \ \
| * | | | Make `hr`s more visible in note bodiesrs-issue-2107Robert Speicher2015-07-271-1/+3
* | | | | Merge branch 'bitbucket-re-authorize' into 'master' Robert Speicher2015-07-281-0/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix bug causing Bitbucket importer to crash when OAuth application had been r...bitbucket-re-authorizeDouwe Maan2015-07-281-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'timestamp-wikis' into 'master' Job van der Voort2015-07-281-1/+5
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Added a timestamp to the wikis page just below the titletimestamp-wikisDarby2015-07-271-1/+5
* | | Merge branch 'fix-quotes-in-branch' into 'master'Douwe Maan2015-07-283-4/+12
|\ \ \
| * | | Fix commit data retrieval when branch name has single quotesStan Hu2015-07-263-4/+12
* | | | Merge branch 'rs-issue-2010' into 'master' Valery Sizov2015-07-283-16/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | Render Note field hints consistently for "new" and "edit" formsrs-issue-2010Robert Speicher2015-07-263-16/+12
* | | | Merge branch 'rs-dev-issue-306' into 'master' Valery Sizov2015-07-271-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Create project services on Project creationrs-dev-issue-306Robert Speicher2015-07-251-0/+2
* | | | Fix live notes refresh in relative URL deploymentsStan Hu2015-07-261-1/+0
| |/ / |/| |
* | | Merge branch 'fix-reload-with-full-diff-url' into 'master'Stan Hu2015-07-253-13/+5
|\ \ \
| * | | Fix the "Reload with full diff" URL buttonStan Hu2015-07-233-13/+5
* | | | Merge branch 'rs-issue-2092' into 'master' Douwe Maan2015-07-256-5/+27
|\ \ \ \
View Lorry Controller Status