summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix Projectapi-new-attributesDouwe Maan2015-07-301-1/+1
|
* No more web urlDouwe Maan2015-07-304-14/+11
|
* Fix specsDouwe Maan2015-07-292-7/+13
|
* Merge branch 'master' into api-new-attributesDouwe Maan2015-07-2921-49/+350
|\
| * Merge branch 'update_chnagelog' into 'master' Valery Sizov2015-07-291-2/+12
| |\ | | | | | | | | | | | | | | | | | | Update chnagelog See merge request !1064
| | * update changelogValery Sizov2015-07-291-2/+12
| |/
| * Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhqValery Sizov2015-07-294-2/+70
| |\
| | * Merge branch 'soft-launch-gitlab-git-http-server' into 'master' Douwe Maan2015-07-294-2/+70
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Experimental support for gitlab-git-http-server https://gitlab.com/gitlab-org/gitlab-git-http-server This change introduces the GITLAB_GRACK_AUTH_ONLY environment variable. When set, Grack requests to GitLab will only respond with the user's GL_ID (if the request is OK) or an error. This allows gitlab-git-http-server to use the main GitLab application as an authentication and authorization backend. If we like how this works we should drop the GITLAB_GRACK_AUTH_ONLY variable at some point in the future. See merge request !1915
| | | * Fix style pointsGitLab2015-07-282-8/+7
| | | | | | | | | | | | | | | | To make Rubocop and Douwe happy
| | | * Send GL_ID to gitlab-git-http-server as JSONGitLab2015-07-281-3/+4
| | | |
| | | * Handle missing @user during Git HTTP requestsGitLab2015-07-281-1/+10
| | | |
| | | * Experimental support for gitlab-git-http-serverJacob Vosmaer2015-07-284-2/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://gitlab.com/gitlab-org/gitlab-git-http-server This change introduces the GITLAB_GRACK_AUTH_ONLY environment variable. When set, Grack requests to GitLab will only respond with the user's GL_ID (if the request is OK) or an error. This allows gitlab-git-http-server to use the main GitLab application as an authentication and authorization backend. If we like how this works we should drop the GITLAB_GRACK_AUTH_ONLY variable at some point in the future.
| * | | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceValery Sizov2015-07-29104-787/+1024
| |\ \ \ | | |/ / | |/| |
| | * | Merge pull request #9341 from rumpelsepp/rougeStan Hu2015-07-286-15/+180
| | |\ \ | | | | | | | | | | Switch back to rouge gem for synthax highlighting
| | | * | Manually update rouge to 1.9.1Stefan Tatschner2015-07-291-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since gollum-lib blocks rouge from updating, let's bump the version manually. The fix has already been accepted upstream: https://github.com/gollum/gollum-lib/commit/9c042ea0914a7714abbda9d89e234c8a79fba893
| | | * | Add HTMLGitlab formatterStefan Tatschner2015-07-292-1/+169
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This custom formatter for rouge is needed to generate HTML output specifically for gitlab. Since its usecase is mostly suitable for gitlab it had been rejected upstream: https://github.com/jneen/rouge/pull/268 Thanks a lot to @stanhu, @jneen and @tsigo for review!
| | | * | Replace Rugments with RougeStefan Tatschner2015-07-295-13/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have mainly created the rugments fork for the purpose of improving gitlab's highlighting. Nowadays IMO it works way better than the old highlight.js solution. But the development is stuck on my side because of a couple of personal reasons: * I have finished my studies; last months I was writing my master thesis. So there was a huge time problem. I am sorry for that. * I had to move to Munich due to getting a (paid) job. Searching a flat here is horrible... :) * Last but not least, maintaining the same code base in two seperate projects is a mess. I have decided to switch back to rouge due to several reasons: * In the beginning I was quite motivated, but since I start working on my new job next week, the best solution IMO is switching back to upstream rouge. * Rouge is continously improving: https://github.com/jneen/rouge/blob/master/CHANGELOG.md http://rouge.jneen.net/ * There should be absolutely no regressions with this change. Most likely this pull request will almost fix some minor bugs. * One less gem in gitlab is a good thing. since Gitlab is quite a huge bundle of gems. Reducing complexity should be a major milestone. Thanks a lot to @stanhu and @jneen for the review!
| | * | | Merge branch 'rs-issue-2107' into 'master' Robert Speicher2015-07-281-1/+3
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make `hr`s more visible in note bodies Closes #2107 See merge request !1054
| | | * | | Make `hr`s more visible in note bodiesrs-issue-2107Robert Speicher2015-07-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Closes #2107
| | * | | | Merge branch 'bitbucket-re-authorize' into 'master' Robert Speicher2015-07-283-6/+17
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug causing Bitbucket importer to crash when OAuth application had been removed. Fixes gitlab-com/support-forum#241. See merge request !1057
| | | * | | | Fix bug causing Bitbucket importer to crash when OAuth application had been ↵bitbucket-re-authorizeDouwe Maan2015-07-283-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | removed.
| | * | | | | Fix extraneous versionStan Hu2015-07-281-1/+0
| | | | | | |
| | * | | | | Merge branch 'fix-semaphore-build-failures' into 'master'Stan Hu2015-07-281-15/+15
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change before(:all) -> let! to avoid leaking data across tests Closes https://github.com/gitlabhq/gitlabhq/issues/9495 See merge request !1061
| | | * | | | Change before(:all) -> let! to avoid leaking data across testsStan Hu2015-07-281-15/+15
| | |/ / / / | | | | | | | | | | | | | | | | | | Closes https://github.com/gitlabhq/gitlabhq/issues/9495
| | * | | | Merge branch 'bump-gitlab-git-for-500-error' into 'master'Stan Hu2015-07-283-3/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Upgrade gitlab_git to version 7.2.6 to fix 500 Error when creating network graphs See merge request !1060
| | | * | | | Upgrade gitlab_git to version 7.2.6 to fix Error 500 when creating network ↵Stan Hu2015-07-283-3/+4
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | graphs Closes #745
| | * | | | Merge branch 'timestamp-wikis' into 'master' Job van der Voort2015-07-281-1/+5
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a timestamp to the wikis page just below the title Now it looks like this: ![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/813f85496db915cf14ee223c8b15478f/image.png) See merge request !1055
| | | * | | Added a timestamp to the wikis page just below the titletimestamp-wikisDarby2015-07-271-1/+5
| | | | | |
| * | | | | Merge branch 'add-file' into 'master' Job van der Voort2015-07-282-1/+34
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New document in GitLab Basics about adding new files See merge request !1913
| | * | | | | fixed details in documentkaren Carias2015-07-271-2/+2
| | | | | | |
| | * | | | | added new document about adding new fileskaren Carias2015-07-232-1/+34
| | | | | | |
| * | | | | | Merge branch 'doc-size' into 'master' Job van der Voort2015-07-281-1/+4
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added info about repo size Because of tweet https://twitter.com/s_hulard/status/624160758335672320 See merge request !1912
| | * | | | | fixed textkaren Carias2015-07-271-1/+2
| | | | | | |
| | * | | | | added info about repo sizekaren Carias2015-07-231-1/+3
| | |/ / / /
| * | | | | Merge branch 'unique-ssh' into 'master' Job van der Voort2015-07-271-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added note about SSH keys being unique Because of issue https://gitlab.com/gitlab-com/support-forum/issues/143 See merge request !1914
| | * | | | | added note about unique SSH keyskaren Carias2015-07-241-0/+3
| |/ / / / /
| * | | | | Merge branch 'labels-mr' into 'master' Job van der Voort2015-07-241-1/+3
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added note about labels in MR because of tweet https://twitter.com/apoirier1/status/624197308759035905 See merge request !1911
| | * | | | added note about labels in MRkaren Carias2015-07-231-1/+3
| |/ / / /
* | | | | Use URL helpersDouwe Maan2015-07-293-4/+5
| | | | |
* | | | | Add project star and fork count, group avatar URL and user/group web URL ↵Douwe Maan2015-07-284-1/+19
| |/ / / |/| | | | | | | | | | | attributes to API
* | | | Merge branch 'fix-api-mr-notes-ordering' into 'master'Douwe Maan2015-07-283-3/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return comments in created order in merge request API Closes #1832 See merge request !985
| * | | | Return comments in created order in merge request APIStan Hu2015-07-163-3/+6
| | | | | | | | | | | | | | | | | | | | Closes #1832
* | | | | Merge branch 'fix-quotes-in-branch' into 'master'Douwe Maan2015-07-287-5/+39
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix commit data retrieval when branch name has single quotes Quotes in ref names need to be escaped properly in JavaScript. Closes #1724 See merge request !1046
| * | | | | Fix commit data retrieval when branch name has single quotesStan Hu2015-07-267-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | Closes #1724
* | | | | | Merge branch 'rs-issue-2010' into 'master' Valery Sizov2015-07-283-16/+12
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Render Note field hints consistently for "new" and "edit" forms - The "Edit" form didn't have Markdown hints. - The "New" form had a paperclip icon for attachments, the "edit" form didn't. Closes #2010 Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2525 See merge request !1049
| * | | | | Render Note field hints consistently for "new" and "edit" formsrs-issue-2010Robert Speicher2015-07-263-16/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The "Edit" form didn't have Markdown hints. - The "New" form had a paperclip icon for attachments, the "edit" form didn't. Closes #2010 Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2525
* | | | | | Merge branch 'rake-update-commit-count' into 'master'Valery Sizov2015-07-272-0/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add rake task 'gitlab:update_commit_count' Starting with migration `20150717130904` commit count is stored in the database. For existing projects it defaults to `0` and is updated to the correct value when commits are pushed. The newly introduced rake task updates the commit count for all projects which have not been updated yet. ![gitlab-rake-update-commit-count](https://gitlab.com/gitlab-org/gitlab-ce/uploads/4785009e0f3fc4c3199fe65dfb8e60e0/gitlab-rake-update-commit-count.png) Refs !986, !989, #2040, #2089. See merge request !1040
| * | | | | | Add rake task 'gitlab:update_commit_count'Daniel Gerhardt2015-07-242-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with migration `20150717130904` commit count is stored in the database. For existing projects it defaults to `0` and is updated to the correct value when commits are pushed. The newly introduced rake task updates the commit count for all projects which have not been updated yet. Refs !986, !989, #2040.
* | | | | | | Merge branch 'rs-dev-issue-306' into 'master' Valery Sizov2015-07-272-2/+12
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create project services on Project creation Closes internal https://dev.gitlab.org/gitlab/gitlab-ee/issues/306#note_53354 See merge request !1045
| * | | | | | Create project services on Project creationrs-dev-issue-306Robert Speicher2015-07-252-0/+9
| | | | | | |