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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Update SSL ciphers per logjam vulnerability recommendations.update_ssl_ciphers	Marin Jankovski	2015-06-15	2	-1/+2
\|
*	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Marin Jankovski	2015-06-15	8	-18/+41
\|\
\| *	Merge branch 'remove-visibility-icons' into 'master'	Douwe Maan	2015-06-15	3	-6/+3
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove visibility icon from projects list on dashboard and group page ## Why? Because * visibility level show on project page anyway * it does not have much value. Main purpose of project list on dashboard is navigation. Avatar + project name helps this goal. Visibility icon have no effect here * it makes UI worse because it brings separation between project avatar and name * without visibility icon we have more space for project name. Especially important for laptops ## Screenshot ![Screenshot_2015-06-12_18.17.20](https://gitlab.com/gitlab-org/gitlab-ce/uploads/0e572388e9a337c5a535813911d08c89/Screenshot_2015-06-12_18.17.20.png) P.S. Merge when 7-12-stable is created See merge request !806
\| \| *	Remove visibility icon from projects list on dashboard and group pageremove-visibility-icons	Dmitriy Zaporozhets	2015-06-12	3	-6/+3
\| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \|	Merge branch 'fix-post-receive-external-tracker' into 'master'	Douwe Maan	2015-06-15	5	-11/+37
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix post-receive errors on a push when an external issue tracker is configured ### What does this MR do? This MR improves upon !766, fixing errors upon a git push that occur only when an external issue tracker (not JIRA) is used. This MR takes into account that external issue trackers, such as JIRA, may close issues. Disabling the processing of post-receive commits when an external issue tracker is configured seems like the wrong behavior. ### Why was this MR needed? When a user adds an issue reference, the refactoring in 8f8a8ab and a6defd157 caused `project.get_issue` to be called, causing `ExternalIssue` to be returned when an external issue tracker was configured. This object does not have a `close` method, as needed in `CloseService`. Nor does it make sense to associate a `SystemNote` with this object. GitLab EE uses a [special case for JIRA](https://gitlab.com/gitlab-org/gitlab-ee/blob/master/app/services/git_push_service.rb#L87). I would recommend moving this logic into `CloseService` too. ### What are the relevant issue numbers? * Closes #1700 * Closes #1720 See merge request !804
\| \| * \|	Fix post-receive errors on a push when an external issue tracker is configured	Stan Hu	2015-06-12	5	-11/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1700 Closes #1720
\| * \| \|	Merge branch 'update-irker-home' into 'master'	Robert Schilling	2015-06-15	1	-1/+1
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Irker home page [ci skip] Closes #1713 See merge request !812
\| \| * \| \|	Update Irker home page	Stan Hu	2015-06-14	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	[ci skip] Closes #1713
* \| \| \| \|	Merge branch 'remove_all_projects_button' into 'master'	Douwe Maan	2015-06-15	1	-3/+0
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove button to all projects on Trending Projects page. Fixes #2001. See merge request !1860
\| * \| \| \|	Remove button to all projects on Trending Projects page.	Nicolas	2015-06-14	1	-3/+0
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #2001.
* \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-06-14	18	-77/+75
\|\ \ \ \
\| * \ \ \	Merge branch 'rs-issue-1432' into 'master'	Dmitriy Zaporozhets	2015-06-14	2	-3/+3
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update Redcarpet to 3.3.0 Fixes #1432 See merge request !809
\| \| * \| \| \|	Update Redcarpet to 3.3.0rs-issue-1432	Robert Speicher	2015-06-13	2	-3/+3
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixes #1432
\| * \| \| \|	Merge branch 'rs-expect-syntax-specs' into 'master'	Dmitriy Zaporozhets	2015-06-14	16	-74/+72
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare specs for RSpec 3 See merge request !811
\| \| * \| \|	Use `page.all` and `page.within` in specsrs-expect-syntax-specs	Robert Speicher	2015-06-13	4	-20/+20
\| \| \| \| \|
\| \| * \| \|	Change `foo.should` syntax to `expect(foo).to` in specs	Robert Speicher	2015-06-13	13	-48/+46
\| \| \| \| \|
\| \| * \| \|	Change `foo.should_not` syntax to `expect(foo).not_to` in specs	Robert Speicher	2015-06-13	4	-6/+6
\| \|/ / /
* \| \| \|	Merge pull request #9340 from jvanbaarsen/update-noteable	Dmitriy Zaporozhets	2015-06-14	3	-2/+6
\|\ \ \ \ \| \|/ / / \|/\| \| \|	Update noteable after a new note is added
\| * \| \|	Update noteable after a new note is added	Jeroen van Baarsen	2015-06-05	3	-2/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	What does this do? It makes sure that whenever a new note is added to an noteable item, the updated_at of that item is also updated. Why is this needed? At this moment when you post a comment on an issue or add a label to an issue, the updated_at is not changed. Because of this the filtering for least recently updated is not really useful (since it only takes in account the original text from the noteable). Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>
* \| \| \|	Merge branch 'rs-issue-1798' into 'master'	Dmitriy Zaporozhets	2015-06-13	3	-12/+12
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Ensure `session_expire_delay` field exists before accessing it Closes #1798 See merge request !808
\| * \| \| \|	Ensure `session_expire_delay` field exists before accessing itrs-issue-1798	Robert Speicher	2015-06-13	3	-12/+12
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \|	Closes #1798
* \| \| \|	Merge branch 'regex-anchor-docs' into 'master'	Sytse Sijbrandij	2015-06-12	1	-0/+30
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add info about regex anchors to shell command docs. Addresses internal issue https://dev.gitlab.org/gitlab/gitlab-ee/issues/263. See merge request !805
\| * \| \| \|	Add info about regex anchors to shell command docs.	Douwe Maan	2015-06-12	1	-0/+30
\|/ / / /
* \| \| \|	Merge branch 'feature-session-expire-seconds-ui' into 'master'	Douwe Maan	2015-06-12	10	-4/+30
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add session expiration delay configuration through UI application Setting is accessible by the administrator through the UI and defaults to 1 week (the current setting) Answers the following suggestions: * http://feedback.gitlab.com/forums/176466-general/suggestions/6210719-make-session-length-configurable * http://feedback.gitlab.com/forums/176466-general/suggestions/6730512-automatic-logout-after-a-time-being-idle See merge request !774
\| * \| \| \|	session_expire_seconds => session_expire_delay	themaze75	2015-06-10	10	-16/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	delay is in seconds more legible code in session_store Added `GitLab restart required` help block to session_expire_delay
\| * \| \| \|	Add session expiration delay configuration through UI application	Eric Maziade	2015-06-05	10	-4/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	settings
* \| \| \| \|	Merge branch 'update-guides-7.12' into 'master'	Jacob Vosmaer	2015-06-12	2	-10/+144
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add 7.12 update guides See merge request !1858
\| * \| \| \| \|	Move mention of git 2.1.2 to intro paragraph	Jacob Vosmaer	2015-06-12	1	-5/+4
\| \| \| \| \| \|
\| * \| \| \| \|	Add 7.12 update guides	Jacob Vosmaer	2015-06-12	2	-10/+145
\| \| \| \| \| \|
* \| \| \| \| \|	Merge branch 'fix_typo_account_page' into 'master'	Douwe Maan	2015-06-12	1	-1/+1
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix typo on account page. @douwe Thanks for reviewing this small fix. See merge request !1854
\| * \| \| \| \| \|	Fix typo on account page.	Nicolas	2015-06-12	1	-1/+1
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'update-install-docs' into 'master'	Marin Jankovski	2015-06-12	1	-4/+4
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Update install docs for 7.12 See merge request !1857
\| * \| \| \| \| \|	New source installs should use 7-12-stable	Jacob Vosmaer	2015-06-12	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Even though the 7-12-stable branch does not exist yet.
\| * \| \| \| \| \|	Install git 2.4.3	Jacob Vosmaer	2015-06-12	1	-2/+2
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Git 2.1.2 does not protect against pushes trying the '.Git/config' attack (CVE-2014-9390). Going to 2.4.3 is perhaps a big jump but why not use the latest? (Famous last words.)
* \| \| \| \| \|	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-06-12	70	-831/+831
\|\ \ \ \ \ \
\| * \ \ \ \ \	Merge branch 'rs-expect-syntax-features' into 'master'	Dmitriy Zaporozhets	2015-06-12	70	-831/+831
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepare feature steps for RSpec 3 See merge request !803
\| \| * \| \| \| \|	Call `page.all` instead of `all` in feature steps	Robert Speicher	2015-06-12	10	-12/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There's a naming conflict between Capybara and rspec-matchers which both define the `all` method. See https://github.com/jnicklas/capybara/issues/1396
\| \| * \| \| \| \|	Change `within` to `page.within` in feature steps	Robert Speicher	2015-06-12	34	-159/+159
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Update all `should`-style syntax to `expect` in features	Robert Speicher	2015-06-12	69	-662/+662
\| \|/ / / / /
* \| \| \| \| \|	Merge branch 'remove-activity-feed-text' into 'master'	Dmitriy Zaporozhets	2015-06-12	3	-3/+0
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Remove text since rss is now to prominent. See merge request !1855
\| * \| \| \| \| \|	Remove text since rss is now to prominent.	Sytse Sijbrandij	2015-06-12	3	-3/+0
\| \| \| \| \| \| \|
* \| \| \| \| \| \|	Merge branch 'rc1-release-doc-link' into 'master'	Job van der Voort	2015-06-12	1	-1/+1
\|\ \ \ \ \ \ \ \| \|_\|/ / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix link to howto_rc1.md The relative link that was there before breaks when you copy-paste the issue template into an actual issue. See merge request !1856
\| * \| \| \| \| \|	Fix link to howto_rc1.md	Jacob Vosmaer	2015-06-12	1	-1/+1
\|/ / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The relative link that was there before breaks when you copy-paste the issue template into an actual issue.
* \| \| \| \| \|	Merge branch 'note_about_omnibus_changes' into 'master'	Dmitriy Zaporozhets	2015-06-12	8	-4/+31
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add a note that changing example configuration files requires changing omnibus-gitlab. Keeping track of changes in these files is not easy and they usually require change in omnibus-gitlab. Added a note so everyone is aware of this. Similar is added to gitlab-shell and gitlab-ci. Discussed in gitlab-org/omnibus-gitlab#605 See merge request !800
\| * \| \| \| \| \|	Add a note that changing example configuration files requires changing ↵note_about_omnibus_changes	Marin Jankovski	2015-06-11	8	-4/+31
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	omnibus-gitlab.
* \| \| \| \| \| \|	Merge branch 'refactor-mr-widget' into 'master'	Dmitriy Zaporozhets	2015-06-12	28	-299/+306
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Refactor accept merge request widget * make each case a simple view * separate merge request JS from merge request accept widget JS Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> See merge request !799
\| * \| \| \| \| \| \|	Fix test for accept merge request	Dmitriy Zaporozhets	2015-06-12	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Fix merge request testrefactor-mr-widget	Dmitriy Zaporozhets	2015-06-11	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Fix automerge	Dmitriy Zaporozhets	2015-06-11	2	-5/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
\| * \| \| \| \| \| \|	Improve variables in mr widget	Dmitriy Zaporozhets	2015-06-11	5	-15/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>