Commit Graph
17895 Commits
Author SHA1 Message Date
Job van der Voort d2fffff0ec Merge branch 'add-mr' into 'master'
New doc about creating a Merge Request in GitLab Basics

Added new doc about creating a new branch.

See merge request !1917
2015-07-31 15:50:41 +00:00
karen Carias e72e721f04 small changes 2015-07-31 08:21:53 -07:00
karen Carias 89fc87122f added image 2015-07-30 13:54:37 -07:00
karen Carias 2911b71e82 added new doc about creating MR 2015-07-30 13:50:15 -07:00
Marin Jankovski 25d9a7f506 Merge branch 'backup-archive-permissions' into 'master'
Allow custom backup archive permissions

This change helps system administrators who want to replicate
GitLab backup files without needing root permissions.

See merge request !1888
2015-07-29 13:51:28 +00:00
Jacob Vosmaer e361dc3a1d Manually fix automatic CHANGELOG merge 2015-07-29 15:46:28 +02:00
Jacob Vosmaer 05b518aa4d Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions 2015-07-29 15:44:04 +02:00
Jacob Vosmaer 097a8952d0 Move CHANGELOG entry to 7.14 2015-07-29 15:42:18 +02:00
Valery Sizov 8bda433734 Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq 2015-07-29 12:19:59 +03:00
Valery Sizov 81c71d2519 Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce 2015-07-29 12:19:37 +03:00
Douwe Maan d64ae5363f Merge branch 'soft-launch-gitlab-git-http-server' into 'master'
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
2015-07-29 09:19:25 +00:00
Stan Hu e6feb98773 Merge pull request #9341 from rumpelsepp/rouge
Switch back to rouge gem for synthax highlighting
2015-07-28 23:57:03 -07:00
Stefan TatschnerandStefan Tatschner f2d4672b38 Manually update rouge to 1.9.1
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
2015-07-29 08:32:00 +02:00
Stefan TatschnerandStefan Tatschner 00ff84d3c0 Add HTMLGitlab formatter
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!
2015-07-29 08:32:00 +02:00
Stefan TatschnerandStefan Tatschner f736721c5b Replace Rugments with Rouge
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!
2015-07-29 07:40:58 +02:00
Robert Speicher 40c32b26af Merge branch 'rs-issue-2107' into 'master'
Make `hr`s more visible in note bodies

Closes #2107

See merge request !1054
2015-07-28 22:12:35 +00:00
Robert Speicher 0f77d4095e Merge branch 'bitbucket-re-authorize' into 'master'
Fix bug causing Bitbucket importer to crash when OAuth application
had been removed.

Fixes gitlab-com/support-forum#241.

See merge request !1057
2015-07-28 21:57:44 +00:00
Stan Hu f8bfd065aa Fix extraneous version 2015-07-28 14:31:02 -07:00
Stan Hu 1894fc110c Merge branch 'fix-semaphore-build-failures' into 'master'
Change before(:all) -> let! to avoid leaking data across tests

Closes https://github.com/gitlabhq/gitlabhq/issues/9495

See merge request !1061
2015-07-28 20:44:24 +00:00
Stan Hu 5bdcef7b0b Change before(:all) -> let! to avoid leaking data across tests
Closes https://github.com/gitlabhq/gitlabhq/issues/9495
2015-07-28 13:06:13 -07:00
Stan Hu 02a15d616b Merge branch 'bump-gitlab-git-for-500-error' into 'master'
Upgrade gitlab_git to version 7.2.6 to fix 500 Error when creating network graphs

See merge request !1060
2015-07-28 17:06:27 +00:00
Stan Hu c22b4061c2 Upgrade gitlab_git to version 7.2.6 to fix Error 500 when creating network graphs
Closes #745
2015-07-28 16:47:30 +00:00
GitLab 16dcf356b5 Fix style points
To make Rubocop and Douwe happy
2015-07-28 18:04:57 +02:00
GitLab 6912f21e5c Send GL_ID to gitlab-git-http-server as JSON 2015-07-28 15:55:53 +02:00
Job van der Voort f21ac8f5c6 Merge branch 'timestamp-wikis' into 'master'
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
2015-07-28 13:47:25 +00:00
Job van der Voort 5efb58b09a Merge branch 'add-file' into 'master'
New document in GitLab Basics about adding new files



See merge request !1913
2015-07-28 13:43:30 +00:00
Job van der Voort 2f5359233d Merge branch 'doc-size' into 'master'
Added info about repo size

Because of tweet https://twitter.com/s_hulard/status/624160758335672320

See merge request !1912
2015-07-28 13:40:19 +00:00
Douwe Maan 42ebd902de Fix bug causing Bitbucket importer to crash when OAuth application had been removed. 2015-07-28 15:33:16 +02:00
GitLab ae9e5eea3c Handle missing @user during Git HTTP requests 2015-07-28 15:17:06 +02:00
Jacob Vosmaer d3305df7aa 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.
2015-07-28 14:33:19 +02:00
Douwe Maan 43d1188031 Merge branch 'fix-api-mr-notes-ordering' into 'master'
Return comments in created order in merge request API

Closes #1832

See merge request !985
2015-07-28 09:15:08 +00:00
Douwe Maan 4fae34d629 Merge branch 'fix-quotes-in-branch' into 'master'
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
2015-07-28 09:13:52 +00:00
Valery Sizov 16ce1d2a5e Merge branch 'rs-issue-2010' into 'master'
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
2015-07-28 06:17:23 +00:00
karen Carias 6b243dd138 fixed text 2015-07-27 21:53:55 -07:00
karen Carias d61433542e fixed details in document 2015-07-27 16:46:30 -07:00
Darby 30b2a95b4d Added a timestamp to the wikis page just below the title 2015-07-27 17:41:31 -04:00
Robert Speicher 12a913a93c Make hrs more visible in note bodies
Closes #2107
2015-07-27 17:32:56 -04:00
Jacob Vosmaer 0be6debb0b Merge branch 'master' of dev.gitlab.org:gitlab/gitlabhq into backup-archive-permissions 2015-07-27 11:22:35 +02:00
Job van der Voort cd6046e1dd Merge branch 'unique-ssh' into 'master'
Added note about SSH keys being unique

Because of issue https://gitlab.com/gitlab-com/support-forum/issues/143

See merge request !1914
2015-07-27 09:16:40 +00:00
Valery Sizov 4a8076a35f Merge branch 'rake-update-commit-count' into 'master'
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
2015-07-27 08:06:42 +00:00
Valery Sizov e1cdc26e48 Merge branch 'rs-dev-issue-306' into 'master'
Create project services on Project creation

Closes internal https://dev.gitlab.org/gitlab/gitlab-ee/issues/306#note_53354

See merge request !1045
2015-07-27 07:36:14 +00:00
Robert Speicher 7679a7ea55 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
2015-07-26 16:55:43 -04:00
Stan Hu 8be3d1204e Merge branch 'fix-notes-refresh-relative-url' into 'master'
Fix live notes refresh in relative URL deployments

### What does this MR do?

This MR fixes URLs used for refreshing notes--the relative_url prefix was appended twice

### Why was this MR needed?

In case of `relative_url` installation, opening a page which does refresh notes (i.e. merge request), the page generates lots of 404 errors in the browser console. It turns out that the relative_url is prepended to the link twice.

Supersedes !233

See merge request !1048
2015-07-26 17:17:18 +00:00
Stan Hu dfe7807653 Fix live notes refresh in relative URL deployments 2015-07-26 09:54:53 -07:00
Stan Hu 562242cb9d Fix commit data retrieval when branch name has single quotes
Closes #1724
2015-07-26 03:47:01 -07:00
Robert Speicher 88aed40962 Create project services on Project creation 2015-07-25 16:43:55 -04:00
Robert Speicher d92668a05b Only create :admin user in the one test where it's used 2015-07-25 16:42:28 -04:00
Stan Hu 4a76cbe219 Merge branch 'fix-reload-with-full-diff-url' into 'master'
Fix the "Reload with full diff" URL button

On the first load, the merge request tabs would be requested in JSON format to render
the HTML. This would cause the "Reload with full diff" button to create a link to `diff.json`. Instead, generate the path in HTML mode.

Closes #2041

See merge request !1019
2015-07-25 15:38:23 +00:00
Douwe Maan fffbc36931 Merge branch 'rs-issue-2092' into 'master'
Dynamically check `:admin_*` ability in two more spots.

Closes #2092 

Depends on !1037 

See merge request !1042
2015-07-25 12:08:36 +00:00
karen Carias f8471cd187 added note about unique SSH keys 2015-07-24 18:05:52 -07:00