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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-03-29	7	-46/+33
\|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \	Merge branch 'repo-buttons' into 'master'	Dmitriy Zaporozhets	2015-03-29	5	-45/+24
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Repo buttons Fixes #796 Moved the star & fork button to inline with the other buttons. See merge request !473
\| \| * \| \| \| \| \| \| \|	Alignment fixes for repo buttons	Phil Hughes	2015-03-29	4	-11/+18
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Moved download button into sidebar	Phil Hughes	2015-03-29	2	-10/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Star and fork buttons moved up
\| \| * \| \| \| \| \| \| \|	Changed button type	Phil Hughes	2015-03-27	2	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Fork/Star button re-design	Phil Hughes	2015-03-26	4	-44/+17
\| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'clear-note-form-on-succcess' into 'master'	Dmitriy Zaporozhets	2015-03-29	2	-1/+9
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent note form from being cleared when submitting failed. When you try to submit a comment while you're not connected to the internet or while your connection is having trouble, the AJAX request would fail and the note would be deleted :cry: See merge request !468
\| \| * \| \| \| \| \| \| \|	Prevent note form from being cleared when submitting failed.clear-note-form-on-succcess	Douwe Maan	2015-03-27	2	-1/+9
\| \| \| \|_\|_\|/ / / / \| \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #9041 from tsigo/rs-maintain-test-schema	Dmitriy Zaporozhets	2015-03-29	1	-0/+2
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add ActiveRecord::Migration.maintain_test_schema! to spec_helper
\| * \| \| \| \| \| \| \| \|	Add ActiveRecord::Migration.maintain_test_schema! to spec_helper	Robert Speicher	2015-03-27	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New in Rails 4.1, this eliminates spec failures due to forgetting to run `db:test:prepare`.
* \| \| \| \| \| \| \| \| \|	Merge pull request #9044 from tsigo/rs-git-template-env	Dmitriy Zaporozhets	2015-03-29	1	-1/+7
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Define GIT_TEMPLATE_DIR environment variable in TestEnv
\| * \| \| \| \| \| \| \| \| \|	Define GIT_TEMPLATE_DIR environment variable in TestEnv	Robert Speicher	2015-03-27	1	-1/+7
\| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See http://schacon.github.io/git/git-init.html#_template_directory Without this variable, any global git hooks a developer might have in ~/.git_template would be linked in the `.git/hooks` folder for every test repository that gets checked out by TestEnv, and would cause certain specs to fail due to pre-existing hook files.
* \| \| \| \| \| \| \| \| \|	Merge pull request #9040 from tsigo/rs-refactor-nav-collapse	Dmitriy Zaporozhets	2015-03-29	1	-8/+3
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor sidebar JS logic
\| * \| \| \| \| \| \| \| \| \|	Simplify toggle-nav-collapse JS	Robert Speicher	2015-03-27	1	-8/+3
\| \|/ / / / / / / / /
* \| \| \| \| \| \| \| \| \|	Merge pull request #9045 from tsigo/rs-move-asana-spec	Dmitriy Zaporozhets	2015-03-29	1	-0/+0
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move asana_service_spec to its correct location
\| * \| \| \| \| \| \| \| \| \|	Move asana_service_spec to its correct location	Robert Speicher	2015-03-27	1	-0/+0
\| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #9048 from NARKOZ/api	Dmitriy Zaporozhets	2015-03-29	1	-4/+1
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|	properly paginate project events in API
\| * \| \| \| \| \| \| \| \|	properly paginate project events in API	Nihad Abbasov	2015-03-29	1	-4/+1
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge branch 'master' of github.com:gitlabhq/gitlabhq	Dmitriy Zaporozhets	2015-03-29	4	-136/+5
\|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / /
\| * \| \| \| \| \| \| \| \|	Merge pull request #9047 from NARKOZ/patch-7	Nihad Abbasov	2015-03-29	3	-135/+4
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \|	update acts-as-taggable-on
\| \| * \| \| \| \| \| \| \|	update acts-as-taggable-on	Nihad Abbasov	2015-03-29	3	-135/+4
\| \|/ / / / / / / /
\| * \| \| \| \| \| \| \|	Merge pull request #9043 from skburgart/fix/merge-wording	Robert Schilling	2015-03-28	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \|	Change merging notification to sound more natural
\| \| * \| \| \| \| \| \|	Change merging notification to sound more natural	Steven Burgart	2015-03-27	1	-1/+1
\| \| \|/ / / / / /
* \| \| \| \| \| \| \|	Merge branch 'fix-plain-diffs' into 'master'	Dmitriy Zaporozhets	2015-03-29	4	-4/+7
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove the email patches link for merge commits Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download them as email patches. This is part of the fix for #1878, and gitlab/gitlab_git!27 allows a plain diff to be generated for a merge commit. Together these changes should prevent the 500 errors described in the issue. cc @sytse See merge request !1737
\| * \| \| \| \| \| \| \|	Upgrade gitlab_git gem to version 7.1.3	Vinnie Okada	2015-03-28	3	-3/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Remove the email patches link for merge commits	Vinnie Okada	2015-03-23	2	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Rugged's `to_mbox` method doesn't work for merge commits, so don't display the option to download merge commits as email patches.
* \| \| \| \| \| \| \| \|	Merge branch 'remove_external_trackers_from_yml' into 'master'	Dmitriy Zaporozhets	2015-03-29	1	-29/+0
\|\ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We've moved external trackers to service, remove from gitlab.yml. Fixes #1937 See merge request !1743
\| * \| \| \| \| \| \| \|	We've moved external trackers to service, remove from gitlab.yml.	Marin Jankovski	2015-03-27	1	-29/+0
\| \| \|/ / / / / / \| \|/\| \| \| \| \| \|
* \| \| \| \| \| \| \|	Small css improvements to selectboxes and issue filter	Dmitriy Zaporozhets	2015-03-27	5	-47/+55
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-03-27	37	-319/+304
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'issues-filters' into 'master'	Dmitriy Zaporozhets	2015-03-27	6	-43/+39
\| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improve UI for issues filters ![filters-ui](https://gitlab.com/gitlab-org/gitlab-ce/uploads/31109bb069a5f42a9b83c2fb44af288b/filters-ui.png) See merge request !472
\| \| * \| \| \| \| \| \|	Improve UI for issues filtersissues-filters	Dmitriy Zaporozhets	2015-03-27	6	-43/+39
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'ctrl-enter-multiple-comments' into 'master'	Dmitriy Zaporozhets	2015-03-27	2	-0/+2
\| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prevent holding Control-Enter or Command-Enter from posting comment multiple times. See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2184 See merge request !467
\| \| * \| \| \| \| \| \| \|	Prevent holding Control-Enter or Command-Enter from posting comment multiple ↵	Douwe Maan	2015-03-27	2	-0/+2
\| \| \| \|_\|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	times.
\| * \| \| \| \| \| \| \|	Merge branch 'master' into 'master'	Robert Schilling	2015-03-27	1	-1/+1
\| \|\ \ \ \ \ \ \ \ \| \| \|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo 'projecti' to 'project' in ssh doc [ci skip] There was a typo in the SSH doc: projecti was written instead of project. See merge request !461
\| \| * \| \| \| \| \| \|	Fix typo 'projecti' to 'project' in ssh doc [ci skip]	Bart Deslagmulder	2015-03-26	1	-1/+1
\| \| \| \|_\|/ / / / \| \| \|/\| \| \| \| \|
\| * \| \| \| \| \| \|	Merge branch 'issues-filters' into 'master'	Dmitriy Zaporozhets	2015-03-27	35	-312/+299
\| \|\ \ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Big refactoring of issues filters * No magic numbers for issues filtering * Squash project users selectbox and users selectbox into one class * Move from API autocomplete to GitLab internal one * Smarter filter for project/group/all issues * Use selectbox with searchbox for assignee/author/milestone/label * Switch to ajax filter for issue author/assignee Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/1035 See merge request !466
\| \| * \| \| \| \| \|	Fix tests and unassigned filter for issues. Updated CHANGELOG	Dmitriy Zaporozhets	2015-03-27	11	-56/+26
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Big refactoring of issues filters	Dmitriy Zaporozhets	2015-03-26	19	-244/+114
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Squash project users selectbox and users selectbox into one class * Move from API autocomplete to GitLab internal one * Smarter filter for project/group/all issues * Use selectbox with searchbox for assignee/author/milestone/label * Switch to ajax filter for issue author/assignee
\| \| * \| \| \| \| \|	Refactor UsersSelect to use internal gitlab autocomplete controller	Dmitriy Zaporozhets	2015-03-26	1	-6/+65
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Add autocomplete controller	Dmitriy Zaporozhets	2015-03-26	3	-0/+86
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	No magic numbers for issues filtering	Dmitriy Zaporozhets	2015-03-26	3	-7/+9
\| \| \|/ / / / /
* \| \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Marin Jankovski	2015-03-26	4	-13/+37
\|\ \ \ \ \ \ \ \| \|/ / / / / /
\| * \| \| \| \| \|	Merge branch 'master' into 'master'	Sytse (admin)	2015-03-26	4	-13/+37
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Separate Dockerfile for Data and Application This is based on #1158 Instead of creating data container from same docker image, we create separate docker image for data container to avoid keeping original docker image after upgrading to new version. (That results in 1GB space that cannot be freed) See merge request !409
\| \| * \| \| \| \|	Separate Dockerfile for Data and Application	Jozef Vaclavik	2015-03-20	4	-13/+37
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Add a note about not adding new setting options to gitlab.yml.	Marin Jankovski	2015-03-26	1	-0/+5
\|/ / / / / /
* \| \| \| \| \|	Merge branch 'set-default-url-options' into 'master'	Dmitriy Zaporozhets	2015-03-26	2	-0/+13
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Set Application controller default URL options to ensure all url_for calls are consistent ### What does this MR do? This MR sets the app controller's `default_url_options` so that all `url_for` calls are consistent. ### Are there points in the code the reviewer needs to double check? Setting these options may simplify `url_for` calls that load the GitLab options already. I did not want to touch existing code yet. I'm also not sure if there are other options that need to be included. ### Why was this MR needed? If you run GitLab behind a reverse proxy or in a Docker container, you don't want a user to be seeing the local IP and port on which GitLab is running (e.g. 192.168.1.1:8080). Right now there are places where this internal data is leaked (e.g. see the URL in Profile Settings -> Account -> Username; this uses `user_url`). ### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)? #1249 See merge request !453
\| * \| \| \| \| \|	Set Application controller default URL options to ensure all url_for calls ↵	Stan Hu	2015-03-25	2	-0/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	are consistent Closes #1249
* \| \| \| \| \| \|	Merge branch 'fix-emailsonpush' into 'master'	Dmitriy Zaporozhets	2015-03-26	2	-1/+12
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix EmailsOnPush. See private issue https://dev.gitlab.org/gitlab/gitlabhq/issues/2185. See merge request !459
\| * \| \| \| \| \| \|	Fix EmailsOnPush.fix-emailsonpush	Douwe Maan	2015-03-26	2	-1/+10
\| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|