delta/gitlab/gitlab-ce.git - gitlab.com: gitlab-org/gitlab-ce.git

	Commit message (Collapse)	Author	Age	Files	Lines
*	Add info about WIP merge requests to docs.wip-mr-docs	Douwe Maan	2015-06-05	6	-3/+17
\|
*	Merge branch 'improve_bitbucket_docs' into 'master'	Douwe Maan	2015-06-05	1	-18/+36
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve BitBucket integration documentation [ci skip] This MR will improve the BitBucket integration documentation by - mentioning the need to reconfigure GitLab after changing the configuration file, if you're using the omnibus package. - adding a section about configuring a Host entry for bitbucket.org. - switching additional steps 1 and 2, because connecting to BitBucket will only work after you added the SSH key and the Host entry. - using sudo for the ssh connection in step 2, so that it is more obvious, that the git account should be used to establish the connection. See merge request !670
\| *	Improve BitBucket integration documentation [ci skip]	Patrick Fey	2015-05-15	1	-18/+36
\| \|
* \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-06-05	3	-2/+4
\|\ \
\| * \	Merge branch 'maser/gitlab-ce-order-commit-comments-in-api' into 'master'	Dmitriy Zaporozhets	2015-06-05	3	-2/+4
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Order commit comments in API chronologically When fetching commit comments via API, the comments were not ordered, but just returned in the order Postgresql finds them. Now the API always returns comments in chronological order. Same as !628 but with CI See merge request !768
\| \| * \|	Order commit comments in API chronologically	Martin Luder	2015-05-08	3	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When fetching commit comments via API, the comments were not ordered, but just returned in the order Postgresql finds them. Now the API always returns comments in chronological order.
* \| \| \|	Merge branch 'ci_script_simplify1' into 'master'	Dmitriy Zaporozhets	2015-06-05	1	-10/+0
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	CI script: remove directives with default value See merge request !1841
\| * \| \|	CI script: remove directives with default value	Valery Sizov	2015-06-04	1	-10/+0
\|/ / /
* \| \|	Merge branch 'rs-remove-guard' into 'master'	Dmitriy Zaporozhets	2015-06-04	6	-85/+0
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove Guard None of the GitLab B.V. developers were using it. See internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2360 See merge request !764
\| * \| \|	Remove unnecessary require from Spinach env	Robert Speicher	2015-06-04	1	-1/+0
\| \| \| \|
\| * \| \|	Remove unnecessary require from RepositoryCache spec	Robert Speicher	2015-06-04	1	-1/+0
\| \| \| \|
\| * \| \|	Remove Guard	Robert Speicher	2015-06-03	4	-83/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	None of the GitLab B.V. developers were using it.
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-06-04	3	-3/+24
\|\ \ \ \
\| * \ \ \	Merge branch 'fix-upgrader-script' into 'master'	Dmitriy Zaporozhets	2015-06-04	3	-3/+24
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix upgrader script This is a fix for upgrader script not guessing the latest version correctly. Upgrader now handles versions where a version part (major/minor/patch) can have multi-digit number, also ensures that the latest version is chosen from git tags by converting tag to Gitlab::VersionInfo and than selecting the latest/greatest version. Fixes: #1476 See merge request !695
\| \| * \| \| \|	Update mocking/stubbing syntax to the new RSpec 3 syntax	Martins Polakovs	2015-05-30	1	-1/+1
\| \| \| \| \| \|
\| \| * \| \| \|	Fix upgrader script	Martins Polakovs	2015-05-23	3	-3/+24
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-06-04	9	-8/+94
\|\ \ \ \ \ \ \| \|/ / / / /
\| * \| \| \| \|	Merge branch 'make-namespaces-api-available-to-all-users' into 'master'	Dmitriy Zaporozhets	2015-06-04	7	-6/+88
\| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make namespace API available to all users ### What does this MR do? This MR makes it possible for a user to query namespaces to which he/she has access. Also, it adds documentation for the existing API. ### Why was this MR needed? Even though the `groups` API exists, it might still be useful to have an endpoint that tells the namespace type (e.g. `user` vs. `group`), especially if a user has access to a number of different projects. ### What are the relevant issue numbers? Closes https://github.com/gitlabhq/gitlabhq/issues/9328 See merge request !708
\| \| * \| \| \| \|	Make namespace API available to all users	Stan Hu	2015-05-28	7	-6/+88
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://github.com/gitlabhq/gitlabhq/issues/9328
\| * \| \| \| \| \|	Merge branch 'sn-push-email-plussign' into 'master'	Dmitriy Zaporozhets	2015-06-04	1	-1/+1
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use entity number for plus sign in push emails Was doing some testing today and found that both outlook and gmail had issues displaying the html content produced for push emails when a file was added. This is how gmail shows it: ![Gmail_name](https://gitlab.com/stevenorman/gitlab-ce/uploads/24be115dbae97997bc02e2ec70d9870c/Gmail_name.png) And this is for Outlook: ![Outlook_name](https://gitlab.com/stevenorman/gitlab-ce/uploads/4b5a54956139d36d78f9c61c83e99928/Outlook_name.png) iOS devices work with the + entity, as does Mail on OS X, but I'm wondering if it is only available for newer html parsers (a quick browse on the w3c site seems to show that it was added in html 5). Changing the entity to `+` and both gmail and outlook and iOS and Mail. See merge request !721
\| \| * \| \| \| \| \|	Use entity number for plus sign	Steve Norman	2015-05-27	1	-1/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'fix-no-labels-page' into 'master'	Dmitriy Zaporozhets	2015-06-04	2	-1/+5
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Omit link to generate labels if user does not have access to create them On a project that has no labels, a user was provided a link to create labels on the "Labels" tab, resulting in a 404. This MR changes the next to "No labels created" if the user lands on this page but does not have permission to add a label. Screenshot: ![image](https://gitlab.com/stanhu/gitlab-ce/uploads/cb04659cf3a0abe1e072cb78d0964b94/image.png) Closes https://github.com/gitlabhq/gitlabhq/issues/8353 See merge request !752
\| \| * \| \| \| \| \| \|	Omit link to generate labels if user does not have access to create them	Stan Hu	2015-06-01	2	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://github.com/gitlabhq/gitlabhq/issues/8353
* \| \| \| \| \| \| \| \|	Merge branch 'refacor-ci-script' into 'master'	Dmitriy Zaporozhets	2015-06-04	1	-48/+3
\|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor CI script Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> cc @valery See merge request !1840
\| * \| \| \| \| \| \| \|	Refactor CI script	Dmitriy Zaporozhets	2015-06-04	1	-48/+3
\|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-06-04	2	-1/+5
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'trigger_hooks_create_on_backup_restore' into 'master'	Dmitriy Zaporozhets	2015-06-04	2	-1/+5
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Trigger hooks create on backup restore Number of users migrating from installation from source to omnibus get this issue. This can be fixed with a bash one liner but we already have a script that creates hooks in gitlab-shell. Added to gitlab:shell:install task call to `bin/create-hooks`. This script is idempotent which means it will only rewrite hooks if something changed. Fixes https://dev.gitlab.org/gitlab/gitlabhq/issues/2208, https://github.com/gitlabhq/gitlabhq/issues/9101 and for the most part https://github.com/gitlabhq/gitlabhq/issues/8161 See merge request !762
\| \| * \| \| \| \| \| \| \|	Add a changelog item.trigger_hooks_create_on_backup_restore	Marin Jankovski	2015-06-03	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Trigger hooks-create on gitlab backup restore.	Marin Jankovski	2015-06-03	1	-0/+3
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-06-04	17	-94/+87
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge branch 'rs-issue-1741' into 'master'	Dmitriy Zaporozhets	2015-06-04	13	-93/+20
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove show actions from Admin and Project DeployKeys Example styling after: > ![Screen_Shot_2015-06-03_at_6.04.51_PM](https://gitlab.com/gitlab-org/gitlab-ce/uploads/105801a7e390224066721bba200c4909/Screen_Shot_2015-06-03_at_6.04.51_PM.png) Closes #1741 See merge request !763
\| \| * \| \| \| \| \| \| \|	Show key fingerprint on DeployKeys#indexrs-issue-1741	Robert Speicher	2015-06-03	5	-15/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also style all key fingerprints consistently across the app.
\| \| * \| \| \| \| \| \| \|	Remove show actions from Admin and Project DeployKeys	Robert Speicher	2015-06-03	8	-78/+4
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge branch 'rs-2fa-docs' into 'master'	Job van der Voort	2015-06-03	4	-1/+67
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 2FA docs See merge request !757
\| \| * \| \| \| \| \| \| \|	fix typo and add screenshots	Job van der Voort	2015-06-03	3	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Add 2FA docsrs-2fa-docs	Robert Speicher	2015-06-02	2	-1/+67
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
* \| \| \| \| \| \| \| \| \|	Merge branch 'add_ci_yaml' into 'master'	Dmitriy Zaporozhets	2015-06-04	1	-0/+94
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added autogenerated .gitlab-ci.yml See merge request !1839
\| * \| \| \| \| \| \| \| \|	added ci yaml	Valery Sizov	2015-06-04	1	-0/+94
\|/ / / / / / / / /
* \| \| \| \| \| \| \| \|	Merge branch 'fix-group-remove' into 'master'	Dmitriy Zaporozhets	2015-06-03	10	-8/+93
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Group improvements * remove projects before removing group * execute all hooks/events from project destroy when group removed * log group create/remove * delay remove of namespace directory (to prevent NFS issues) Inspired by !759 See merge request !761
\| * \| \| \| \| \| \| \| \|	Add CHANGELOG item	Dmitriy Zaporozhets	2015-06-03	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Skip repo removing whem remove user or group	Dmitriy Zaporozhets	2015-06-03	5	-11/+63
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Log group creation and removal	Dmitriy Zaporozhets	2015-06-03	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \|	Merge branch 'repo-remove' into fix-group-remove	Dmitriy Zaporozhets	2015-06-03	7	-41/+106
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/projects_spec.rb
\| * \| \| \| \| \| \| \| \| \|	Remove projects before group/user. Remove namespace directory asyncfix-group-remove	Dmitriy Zaporozhets	2015-06-03	3	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \| \| \| \|	Wrap group removal into service	Dmitriy Zaporozhets	2015-06-03	4	-3/+14
\| \| \|/ / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* \| \| \| \| \| \| \| \| \|	Merge branch 'remove_unecessary_rake_task' into 'master'	Dmitriy Zaporozhets	2015-06-03	4	-62/+36
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove gitlab:env:check task. Rake task that checks for git user git settings is a leftover from early days. It is not being used by the web editor(and web editor is also being redone atm) so this rake task just causes confusion. Adresses internal issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2362 See merge request !758
\| * \| \| \| \| \| \| \| \| \|	Add autocrlf back to installation docs, add a check for it.	Marin Jankovski	2015-06-03	3	-2/+36
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Remove gitlab:env:check task.remove_unecessary_rake_task	Marin Jankovski	2015-06-03	3	-62/+2
\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'repo-remove'	Dmitriy Zaporozhets	2015-06-03	7	-41/+106
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / / \| \|/\| \| / / / / / / / \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> Conflicts: spec/features/projects_spec.rb
\| * \| \| \| \| \| \| \| \|	Fix tests and increase delay time before remove repository	Dmitriy Zaporozhets	2015-06-03	3	-17/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>