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

	Commit message (Collapse)	Author	Age	Files	Lines
*	API: Ability to subscribe and unsubscribe from an issue	Robert Schilling	2016-04-13	5	-0/+197
\|
*	Merge branch 'api-move-issues' into 'master'	Rémy Coutable	2016-04-13	4	-1/+148
\|\ \| \| \| \| \| \| \| \| \| \| \| \|	API: Ability to move an issue Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14741 See merge request !3593
\| *	Fix doc for moving an issue	Robert Schilling	2016-04-13	1	-1/+1
\| \|
\| *	Update tests for moving issues via API	Robert Schilling	2016-04-13	4	-30/+51
\| \|
\| *	API: Ability to move an issue	Robert Schilling	2016-04-13	4	-1/+127
\| \|
* \|	Merge branch 'patch-2' into 'master'	Robert Schilling	2016-04-13	1	-1/+1
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	improve formatting See merge request !3688
\| * \|	improve formatting	Ben Bodenmiller	2016-04-12	1	-1/+1
\| \| \|
* \| \|	Merge branch 'custom-transaction-tags' into 'master'	Rémy Coutable	2016-04-13	3	-0/+36
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added ability to add custom tags to transactions cc @pcarranza See merge request !3674
\| * \| \|	Added ability to add custom tags to transactions	Yorick Peterse	2016-04-13	3	-0/+36
\| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	One use case for this is manually setting the "action" tag for Grape API calls. Due to Grape running blocks there are no human readable method names that can be used for the "action" tag, thus we have to set these manually on a case by case basis.
* \| \|	Merge branch 'configure_trusted_proxies' into 'master'	Rémy Coutable	2016-04-13	5	-0/+24
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adjust the default trusted_proxies to only include localhost And also allow other trusted proxies to be added from the config.yml. Fixes https://gitlab.com/gitlab-org/gitlab-ce/issues/3538 Omnibus config: https://gitlab.com/gitlab-org/omnibus-gitlab/issues/1208 See merge request !3524
\| * \| \|	Updated trusted proxies doc section to link to the restart GitLab docsconfigure_trusted_proxies	DJ Mountney	2016-04-12	1	-1/+2
\| \| \| \|
\| * \| \|	Add changelog entries, install docs, and gitlab.yml.example entry for the ↵	DJ Mountney	2016-04-12	3	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	trusted_proxies setting
\| * \| \|	Adjust the default trusted_proxies to only include localhost, and allow ↵	DJ Mountney	2016-04-12	2	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	other trusted proxies to be configured.
* \| \| \|	Merge branch 'jira_docs' into 'master'	Achilleas Pipinellis	2016-04-13	2	-5/+17
\|\ \ \ \ \| \|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Tie example config to JIRA screenshot Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15203 See merge request !3693
\| * \| \|	Tie example config to JIRA screenshot	Achilleas Pipinellis	2016-04-13	2	-5/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/15203
* \| \| \|	Merge branch 'issue_15044' into 'master'	Rémy Coutable	2016-04-13	4	-6/+37
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow to close invalid merge request fixes #15044 See merge request !3664
\| * \| \|	Add changelog entry, improve specs and model codeissue_15044	Felipe Artur	2016-04-12	3	-14/+9
\| \| \| \|
\| * \| \|	Allow to close invalid merge request	Felipe Artur	2016-04-11	3	-5/+41
\| \| \| \|
* \| \| \|	Merge branch 'docs-new-branch-button-3886' into 'master'	Achilleas Pipinellis	2016-04-13	2	-0/+32
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Docs for the new branch button [ci-skip] Closes #3886 @axil Could you check this and make sure this is up to your standards? See merge request !3425
\| * \| \| \|	Move 'New branch from issue' feature doc to web_editor.md	Achilleas Pipinellis	2016-04-13	3	-9/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip]
\| * \| \| \|	Docs for the new branch buttondocs-new-branch-button-3886	Zeger-Jan van de Weg	2016-03-28	2	-0/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci-skip]
* \| \| \| \|	Merge branch 'fix-stale-branch-count-cache' into 'master'	Yorick Peterse	2016-04-13	3	-0/+5
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix repository cache invalidation issue when project is recreated with an empty repo See merge request !3692
\| * \| \| \| \|	Fix repository cache invalidation issue when project is recreated with an ↵	Stan Hu	2016-04-13	3	-0/+5
\| \| \|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	empty repo To reproduce: 1. Create a project with some content 2. Rename the project 3. Create a new project with the same name. 4. Boom - 404. After step 2, the branch and tag counts were not being cleared. This would cause `repository.has_visible_content?` to erroneously return `true` for the newly-created project. Closes #13384
* \| \| \| \|	Merge branch 'api-group-visibility' into 'master'	Rémy Coutable	2016-04-13	4	-2/+152
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	API: Ability to update a group This makes it much easier to update a group after introducing the group visibility. * Closes #14991 See merge request !3587
\| * \| \| \|	Fix minor issues according development guidelines	Robert Schilling	2016-04-12	3	-11/+17
\| \| \| \| \|
\| * \| \| \|	API: Ability to update a group	Robert Schilling	2016-04-12	4	-2/+146
\| \| \| \| \|
* \| \| \| \|	Merge branch 'notes-input' into 'master'	Jacob Schatz	2016-04-12	3	-5/+36
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Wrap text in notes box if longer than code in diff * Fixes branch name overflow * Text and inline `code` wraps in comments * `code` blocks scroll horizontally ![Screen_Shot_2016-04-11_at_4.59.15_PM](/uploads/39eee7d35ea79d1a3944aa6281b72121/Screen_Shot_2016-04-11_at_4.59.15_PM.png) See merge request !3626
\| * \| \| \| \|	Remove max-width from commentsnotes-input	Annabel Dunstone	2016-04-12	2	-14/+0
\| \| \| \| \| \|
\| * \| \| \| \|	Input updates	Annabel Dunstone	2016-04-12	3	-5/+49
\| \| \| \| \| \|
\| * \| \| \| \|	Wrap text in notes box if longer than code in diff	Annabel Dunstone	2016-04-12	1	-0/+1
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix-todo-target-path' into 'master'	Robert Speicher	2016-04-12	2	-0/+4
\|\ \ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix todo_target_path for todos where target was removed Fixes #15187 See merge request !3684
\| * \| \| \| \|	Fix todo_target_path for todos where target was removedfix-todo-target-path	Douglas Barbosa Alexandre	2016-04-12	2	-0/+4
\|/ / / / /
* \| \| \| \|	Merge branch 'rs-update-spring' into 'master'	Robert Speicher	2016-04-12	2	-6/+6
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update spring and spring-commands-spinach Spring changelog: https://git.io/vVAUY See merge request !3681
\| * \| \| \| \|	Update spring and spring-commands-spinachrs-update-spring	Robert Speicher	2016-04-12	2	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Spring changelog: https://git.io/vVAUY
* \| \| \| \| \|	Merge branch 'issue_14206' into 'master'	Jacob Schatz	2016-04-12	6	-7/+160
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix datetimes on tooltips Closes #14206 Updates tooltip datetimes on `.timeago()` instances. Inline notes ![Screen_Shot_2016-04-07_at_1.25.12_PM](/uploads/2f55390a7e91dabf75e71fe3bda91849/Screen_Shot_2016-04-07_at_1.25.12_PM.png) Existing and new notes ![Screen_Shot_2016-04-07_at_1.24.49_PM](/uploads/202bb7476738eb048f2d94abb68174e7/Screen_Shot_2016-04-07_at_1.24.49_PM.png) Issuable dates ![Screen_Shot_2016-04-07_at_1.24.32_PM](/uploads/80fd5cc3c06fade0b1c615bc7b7611a8/Screen_Shot_2016-04-07_at_1.24.32_PM.png) Build dates ![Screen_Shot_2016-04-07_at_1.25.02_PM](/uploads/832f43284005ea610a3ad54a49b97104/Screen_Shot_2016-04-07_at_1.25.02_PM.png) See merge request !3497
\| * \ \ \ \ \	Merge branch 'master' into issue_14206issue_14206	Alfredo Sumaran	2016-04-11	214	-943/+2578
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	Rename method and initialize .timeago inside	Alfredo Sumaran	2016-04-11	4	-19/+10
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Update datetime in .timeago elements	Alfredo Sumaran	2016-04-07	3	-6/+28
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This should be done before .timeago() is called on the element
\| * \| \| \| \| \| \|	Add datetime_utility.js.coffee	Alfredo Sumaran	2016-04-07	1	-0/+15
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Add date.format.js	Alfredo Sumaran	2016-04-07	1	-0/+125
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Convert time param to Time	Alfredo Sumaran	2016-04-07	1	-1/+1
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'check-import-job-status' into 'master'	Robert Speicher	2016-04-12	1	-2/+8
\|\ \ \ \ \ \ \ \ \| \|_\|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Check and report import job status to help diagnose issues with forking There are no functional changes, but adding checks/logs for Sidekiq job IDs to help track down why many users seem to get stuck fork/import jobs. See merge request !3672
\| * \| \| \| \| \| \|	Check and report import job status to help diagnose issues with forking	Stan Hu	2016-04-11	1	-2/+8
\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge branch 'project-title-dropdown' into 'master'	Jacob Schatz	2016-04-12	10	-37/+82
\|\ \ \ \ \ \ \ \ \| \|_\|_\|_\|_\|_\|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Project dropdown in header uses new dropdown See merge request !3339
\| * \| \| \| \| \| \|	Updated CHANGELOG	Phil Hughes	2016-04-12	1	-9/+1
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Updated based on Ruby feedback	Phil Hughes	2016-04-12	2	-1/+9
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Updated Ruby	Phil Hughes	2016-04-12	2	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added CHANGELOG item
\| * \| \| \| \| \| \|	Updated based on Ruby feedback	Phil Hughes	2016-04-12	3	-19/+21
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Tests update	Phil Hughes	2016-04-12	2	-22/+24
\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \|	Updated tests	Phil Hughes	2016-04-12	3	-4/+3
\| \| \| \| \| \| \| \|