15277 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dmitriy Zaporozhets	549e6c100b	Better legend for contribution calendar	2015-03-31 05:50:10 +03:00
Dmitriy Zaporozhets	64c89e6012	Merge branch 'commits-count-badge' into 'master' ... Added badge to commits tab Fixes #1261 See merge request !465	2015-03-30 21:52:26 +00:00
Phil Hughes	4d7cd4f329	Added badge to commits tab	2015-03-30 22:46:01 +01:00
Dmitriy Zaporozhets	661c9f0f8f	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-03-30 14:18:19 -07:00
Dmitriy Zaporozhets	6574bffef6	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-03-30 14:18:11 -07:00
Dmitriy Zaporozhets	b7e2be247f	Fix adding new members to group	2015-03-30 14:17:49 -07:00
Dmitriy Zaporozhets	c66c3a34c4	Merge pull request #9056 from mavimo/patch-3 ... Fix merge errors on CHANGELOG	2015-03-30 13:23:08 -07:00
Douwe Maan	fe7992a524	Merge branch 'events-paginate' into 'master' ... API: Events paginate Updated the api method for /project/:id/events, to use the paginate method instead of limiting and offsetting the recent events in the method itself. This will also change the first page to be 1 instead of 0, but using 0 will still work and will give back the first page. This also add's the link headers (next/first/last). See merge request !267	2015-03-30 19:01:03 +00:00
Achilleas Pipinellis	5059681f22	Merge branch 'upgrade-dockerfile-7.9.1' into 'master' ... Bump Docker build to GitLab v7.9.1 Upgrade GitLab from v7.9.0 to v7.9.1. See merge request !476	2015-03-30 16:18:29 +00:00
Marco Vito Moscaritolo	718661f9aa	Fix merge errors on CHANGELOG ... During merges (d554070a and 497fd75d) changelog was "damaged", I restored the tagged 7.9.1 and added the required changes about 7.10.0 (unreleased). I think we need to ensure all PR are rebased on master before merge.	2015-03-30 18:17:41 +02:00
Stan Hu	b06a4ff5a7	Bump Docker build to GitLab v7.9.1	2015-03-30 15:18:43 +00:00
Robert Schilling	43a680b9e9	Merge pull request #9053 from firstrow/patch-1 ... LICENSE year update	2015-03-30 10:05:47 +02:00
Andrew	227535761d	LICENSE year update	2015-03-30 11:03:42 +03:00
Dmitriy Zaporozhets	3371e40bd4	Include brakeman in rake test	2015-03-29 18:55:18 -07:00
Dmitriy Zaporozhets	9d6ffcfa5f	Refactor star btn logic for non-logged in user and fix tests	2015-03-29 18:50:45 -07:00
Dmitriy Zaporozhets	405f91d2b8	Refactor star/fork buttons	2015-03-29 18:15:54 -07:00
Dmitriy Zaporozhets	6b9f1e1a9f	Merge branch 'file-type' of https://github.com/Soullivaneuh/gitlabhq into Soullivaneuh-file-type	2015-03-29 17:23:53 -07:00
Dmitriy Zaporozhets	38dd6bcaae	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-03-29 17:23:09 -07:00
Dmitriy Zaporozhets	57a49b340e	Merge branch 'repo-buttons' into 'master' ... Repo buttons Fixes #796 Moved the star & fork button to inline with the other buttons. See merge request !473	2015-03-29 17:21:31 +00:00
Phil Hughes	6920fd3ddd	Alignment fixes for repo buttons	2015-03-29 12:56:45 +01:00
Phil Hughes	7652510c6b	Moved download button into sidebar ... Star and fork buttons moved up	2015-03-29 12:23:56 +01:00
Dmitriy Zaporozhets	40c3675372	Merge branch 'clear-note-form-on-succcess' into 'master' ... 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 😢 See merge request !468	2015-03-29 10:58:34 +00:00
Dmitriy Zaporozhets	5e266f84f5	Merge pull request #9041 from tsigo/rs-maintain-test-schema ... Add ActiveRecord::Migration.maintain_test_schema! to spec_helper	2015-03-29 03:42:58 -07:00
Dmitriy Zaporozhets	275f64fb86	Merge pull request #9044 from tsigo/rs-git-template-env ... Define GIT_TEMPLATE_DIR environment variable in TestEnv	2015-03-29 03:40:56 -07:00
Dmitriy Zaporozhets	0a634f3481	Merge pull request #9040 from tsigo/rs-refactor-nav-collapse ... Refactor sidebar JS logic	2015-03-29 03:36:28 -07:00
Dmitriy Zaporozhets	9742c51438	Merge pull request #9045 from tsigo/rs-move-asana-spec ... Move asana_service_spec to its correct location	2015-03-29 03:35:36 -07:00
Dmitriy Zaporozhets	7096ebe8c6	Merge pull request #9048 from NARKOZ/api ... properly paginate project events in API	2015-03-29 03:35:16 -07:00
Dmitriy Zaporozhets	ccab346a78	Merge branch 'master' of github.com:gitlabhq/gitlabhq	2015-03-29 03:32:28 -07:00
Dmitriy Zaporozhets	5f3a758721	Merge branch 'fix-plain-diffs' into 'master' ... 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	2015-03-29 10:32:27 +00:00
Dmitriy Zaporozhets	0154338ed8	Merge branch 'remove_external_trackers_from_yml' into 'master' ... We've moved external trackers to service, remove from gitlab.yml. Fixes #1937 See merge request !1743	2015-03-29 05:31:19 +00:00
Nihad Abbasov	bba2b10eb5	properly paginate project events in API	2015-03-29 05:36:53 +05:00
Nihad Abbasov	7277280d5f	Merge pull request #9047 from NARKOZ/patch-7 ... update acts-as-taggable-on	2015-03-29 05:04:45 +05:00
Nihad Abbasov	be65373fc7	update acts-as-taggable-on	2015-03-29 03:39:32 +04:00
Sullivan SENECHAL	8ef7220c23	Improve file icons rendering on tree	2015-03-28 16:49:05 +01:00
Vinnie Okada	fabaeb096f	Upgrade gitlab_git gem to version 7.1.3	2015-03-28 09:10:12 -06:00
Robert Schilling	db948ff3d6	Merge pull request #9043 from skburgart/fix/merge-wording ... Change merging notification to sound more natural	2015-03-28 09:37:18 +01:00
Robert Speicher	32d6a14098	Move asana_service_spec to its correct location	2015-03-27 22:53:27 -04:00
Robert Speicher	0f1d8e771f	Define GIT_TEMPLATE_DIR environment variable in TestEnv ... 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.	2015-03-27 22:26:03 -04:00
Dmitriy Zaporozhets	6664da431a	Small css improvements to selectboxes and issue filter	2015-03-27 14:28:24 -07:00
Dmitriy Zaporozhets	4d9b4d3582	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	2015-03-27 13:43:46 -07:00
Dmitriy Zaporozhets	9007af2c7e	Merge branch 'issues-filters' into 'master' ... Improve UI for issues filters  See merge request !472	2015-03-27 20:38:19 +00:00
Steven Burgart	83064492a0	Change merging notification to sound more natural	2015-03-27 15:50:54 -04:00
Robert Speicher	190e08979c	Add ActiveRecord::Migration.maintain_test_schema! to spec_helper ... New in Rails 4.1, this eliminates spec failures due to forgetting to run `db:test:prepare`.	2015-03-27 15:31:16 -04:00
Robert Speicher	65c4dc19f7	Simplify toggle-nav-collapse JS	2015-03-27 15:16:20 -04:00
Dmitriy Zaporozhets	70496fe5d8	Improve UI for issues filters	2015-03-27 12:00:31 -07:00
Dmitriy Zaporozhets	671be8a812	Merge branch 'ctrl-enter-multiple-comments' into 'master' ... 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	2015-03-27 16:54:35 +00:00
Marin Jankovski	bfc36fff11	We've moved external trackers to service, remove from gitlab.yml.	2015-03-27 09:25:35 -07:00
Douwe Maan	7a70fb123c	Prevent holding Control-Enter or Command-Enter from posting comment multiple times.	2015-03-27 16:55:18 +01:00
Douwe Maan	351e61f4b2	Prevent note form from being cleared when submitting failed.	2015-03-27 12:52:07 +01:00
Robert Schilling	7869e258f7	Merge branch 'master' into 'master' ... 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	2015-03-27 10:21:52 +00:00