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

	Commit message (Collapse)	Author	Age	Files	Lines
...
* \| \| \| \|	Merge branch 'replace_passwords_with_asterisk' into 'master'	Marin Jankovski	2015-03-12	1	-0/+10
\|\ \ \ \ \ \| \|/ / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Show asterisks instead of password in service edit form. See merge request !1686
\| * \| \| \|	Show asterisks instead of password in service edit form.	Marin Jankovski	2015-03-12	1	-0/+10
\| \| \| \| \|
* \| \| \| \|	replace images in emails with inline images	Hannes Rosenögger	2015-03-12	1	-0/+25
\|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This adds the functionality of replacing all images that were uploaded to gitlab with inline images(base64) in emails. This change fixes the broken images in emails that 7.8 introduced
* \| \| \|	Merge branch 'markdown-smb-link' into 'master'	Dmitriy Zaporozhets	2015-03-12	1	-1/+1
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allow smb:// links in Markdown text. As requested by Sam McLeod at https://gitlab.com/gitlab-org/gitlab-ce/issues/1184 See merge request !1669
\| * \| \| \|	Allow smb:// links in Markdown text.	Douwe Maan	2015-03-10	1	-1/+1
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	Merge branch 'fix-code-preview' into 'master'	Marin Jankovski	2015-03-11	2	-2/+4
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix code preview theme setting for comments, issues, merge requests, and snippets User color scheme was not being used: default white color scheme was always chosen. Also, default background for code in notes was always overriding the user color scheme. Closes #1139 See merge request !357
\| * \| \| \|	Fix code preview theme setting for comments, issues, merge requests, and ↵	Stan Hu	2015-03-10	2	-2/+4
\| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	snippets. Also preserve code preview color scheme in events dashboard. Assign default colors to all code blocks shown as <pre class="code highlight [color_scheme]"> Closes #1139
* \| \| \|	Add project filter by visibility and tag to explore page	Dmitriy Zaporozhets	2015-03-10	2	-16/+17
\|/ / /
* \| \|	Render milestone progress with one helper method	Dmitriy Zaporozhets	2015-03-09	1	-0/+11
\|/ /
* \|	Added comment notification events to HipChat and Slack services.	Stan Hu	2015-03-06	1	-0/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Supports four different event types all bundled under the "note" event type: - comments on a commit - comments on an issue - comments on a merge request - comments on a code snippet
* \|	Merge branch 'dashboard-milestones' into 'master'	Dmitriy Zaporozhets	2015-03-04	1	-0/+2
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add dashboard milestones. Closes #1422. ![Screen_Shot_2015-03-03_at_16.20.36](https://dev.gitlab.org/gitlab/gitlabhq/uploads/795b480a2552e1d26436c3db2158cb81/Screen_Shot_2015-03-03_at_16.20.36.png) See merge request !1621
\| * \|	Add dashboard milestones.	Douwe Maan	2015-03-03	1	-0/+2
\| \| \|
* \| \|	Fix bug where editing a comment with "+1" or "-1" would cause a server error	Stan Hu	2015-03-02	1	-3/+3
\|/ / \| \| \| \| \| \|	Closes #1151
* \|	Fix broken `project_url` routing when protected branches are accessed with ↵	Stan Hu	2015-03-01	1	-0/+16
\| \| \| \| \| \| \| \|	an empty repo
* \|	Merge pull request #8890 from sue445/feature/project_api_avatar_url	Jeroen van Baarsen	2015-03-01	1	-4/+2
\|\ \ \| \| \| \| \| \|	Expose avatar_url in projects API
\| * \|	Expose avatar_url in projects API	sue445	2015-03-01	1	-4/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	* Impl Project#avatar_url * Refactor ApplicationHelper: Use Project#avatar_url * Update changelog
* \| \|	Merge branch 'route-helper' into 'master'	Dmitriy Zaporozhets	2015-02-27	2	-2/+33
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Introduce shortcuts for routing helpers See merge request !1600
\| * \| \|	Add explanation to routing method	Dmitriy Zaporozhets	2015-02-25	1	-0/+13
\| \| \| \|
\| * \| \|	Introduce shortcuts for routing helpers	Dmitriy Zaporozhets	2015-02-25	2	-2/+20
\| \|/ /
* \| \|	Merge branch 'event_tooltip_addition' into 'master'	Marin Jankovski	2015-02-26	1	-1/+1
\|\ \ \ \| \|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added information to tooltips Tooltips now have meaning by mentioning their function ("Filter by..."). Fixes #1992 See merge request !1571
\| * \|	Added information to tooltips	Sabba Petri	2015-02-23	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|	Tooltips now have meaning by mentioning their function ("Filter by..."). Fixes #1992
* \| \|	Merge branch 'bitbucket-import'	Dmitriy Zaporozhets	2015-02-25	2	-10/+4
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/views/import/gitorious/status.html.haml db/schema.rb
\| * \| \|	Load public key in initializer.	Douwe Maan	2015-02-24	2	-12/+2
\| \| \| \|
\| * \| \|	Add Bitbucket importer.	Douwe Maan	2015-02-24	2	-2/+6
\| \|/ /
* \| \|	Get rid of black logo	Dmitriy Zaporozhets	2015-02-24	1	-5/+1
\| \| \|
* \| \|	Refactor header logo and setup expectation on it size	Dmitriy Zaporozhets	2015-02-24	1	-0/+8
\|/ /
* \|	Merge branch 'master' into rails-4.1.9	Vinnie Okada	2015-02-19	5	-27/+49
\|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: app/views/dashboard/_project.html.haml app/views/events/event/_common.html.haml app/views/explore/projects/_project.html.haml app/views/groups/_projects.html.haml app/views/projects/_home_panel.html.haml app/views/projects/_issues_nav.html.haml app/views/projects/issues/_discussion.html.haml app/views/projects/issues/_issues.html.haml app/views/projects/issues/show.html.haml app/views/projects/merge_requests/_discussion.html.haml app/views/projects/merge_requests/_show.html.haml app/views/projects/milestones/index.html.haml app/views/projects/notes/_edit_form.html.haml app/views/shared/_issuable_filter.html.haml
\| * \	Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce	Dmitriy Zaporozhets	2015-02-18	1	-1/+1
\| \|\ \
\| \| * \	Merge branch 'no-highlight-files' into 'master'	Sytse Sijbrandij	2015-02-18	1	-1/+1
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add "NEWS" to no_highlight_files "NEWS" is used in gnu style opensource projects for the changelog. So let's add it to `no_highlight_files`. See merge request !249
\| \| \| * \|	Added "news" to no_highlight_files	Stefan Tatschner	2014-12-03	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge branch 'performance-improvements' into 'master'	Dmitriy Zaporozhets	2015-02-18	1	-1/+7
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Performance improvements * More efficient DB queries * Cache ApplicationSettings per request * Dont query for objects you dont need See merge request !1540
\| \| * \| \| \|	DB performance improvements to GitLab	Dmitriy Zaporozhets	2015-02-18	1	-1/+7
\| \| \|/ / /
\| * \| \| \|	Fix Markdown relative links to files with anchors.	Douwe Maan	2015-02-18	1	-4/+5
\| \|/ / /
\| * \| \|	Add link to share via twitter to "created project" event.	Douwe Maan	2015-02-13	1	-0/+4
\| \| \| \|
\| * \| \|	Refactor event title generation for more consistent messages.	Douwe Maan	2015-02-13	1	-21/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Example: "User joined project Namespace / Project" rather than "User joined project at Namespace / Project"
* \| \| \|	Upgrade to Rails 4.1.9	Vinnie Okada	2015-02-14	14	-62/+156
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make the following changes to deal with new behavior in Rails 4.1.2: * Use nested resources to avoid slashes in arguments to path helpers.
* \| \|	Merge branch 'master' into 'master'	Dmitriy Zaporozhets	2015-02-12	1	-3/+16
\|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds new label color suggestions This adds a bunch of label color suggestions ![labels2](https://gitlab.com/uploads/gitlab-org/gitlab-ce/ac1a207575/labels2.png) ![labels1](https://gitlab.com/uploads/benny/gitlab-ce/d47fbecc16/labels1.png) See merge request !289
\| * \| \|	Reorders label colors for better "rainbow"	phortx	2015-01-13	1	-8/+8
\| \| \| \|
\| * \| \|	Add more label color suggestions	phortx	2015-01-13	1	-1/+14
\| \| \| \|
* \| \| \|	Add labels notes	Nikita Verkhovin	2015-02-08	1	-1/+1
\| \| \| \|
* \| \| \|	Merge branch 'api-default-order' into 'master'	Dmitriy Zaporozhets	2015-02-06	1	-0/+79
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Sorting refactoring * refactor sorting logic for web UI * refactor and document ordering for API: project, issues, merge requests * explicitly define ordering in models using default_scope See merge request !1476
\| * \| \| \|	Refactor sorting in project	Dmitriy Zaporozhets	2015-02-05	1	-0/+79
\| \| \| \| \|
* \| \| \| \|	GitLab integration. Importer	Valery Sizov	2015-02-05	2	-2/+6
\|/ / / /
* \| \| \|	Improve collapsing sidebar	Dmitriy Zaporozhets	2015-02-03	1	-0/+8
\| \| \| \|
* \| \| \|	Merge branch 'collapseable-nav' of ↵	Dmitriy Zaporozhets	2015-02-03	1	-0/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	https://github.com/jasonblanchard/gitlabhq into jasonblanchard-collapseable-nav
\| * \| \| \|	Adds persistent collapse button for left side bar	Jason Blanchard	2015-02-03	1	-0/+5
\| \| \| \| \|
* \| \| \| \|	Rubocop: indentation fixes Yay!!!	Dmitriy Zaporozhets	2015-02-02	2	-2/+2
\| \| \| \| \|
* \| \| \| \|	Rubocop: no trailing newlines	Dmitriy Zaporozhets	2015-02-02	1	-1/+0
\| \| \| \| \|
* \| \| \| \|	Rubocop: Style/ElseAlignment enabled	Dmitriy Zaporozhets	2015-02-02	1	-6/+7
\| \| \| \| \|
* \| \| \| \|	Rubocop: comment indentation	Dmitriy Zaporozhets	2015-02-02	1	-1/+1
\| \| \| \| \|