summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Move "Forked from" above "Version".project-pageDouwe Maan2015-05-121-8/+9
|
* Move clone panel to bottom of project sidebar.Douwe Maan2015-05-121-3/+3
|
* Restructure project sidebar.Douwe Maan2015-05-122-65/+81
|
* Fix alignment of ref picker, breadcrumb and buttons.Douwe Maan2015-05-124-14/+3
|
* Add icons to more tabs.Douwe Maan2015-05-122-1/+8
|
* Merge branch 'commit_time_timezone' into 'master'Douwe Maan2015-05-122-1/+2
|\ | | | | | | | | | | | | | | | | | | | | | | | | Fix commit time being displayed in the wrong timezone in some cases This MR makes sure that the displayed commit date is shown in the timezone that's configured in the gitlab.yml. Before it was possible that the `committed_date` of a commit would display different values on the dashboard and the commit page. fixes gitlab-org/gitlab-ce#1278 /cc @DouweM See merge request !624
| * Fix commit time being displayed in the wrong timezone in some casesHannes Rosenögger2015-05-072-1/+2
| |
* | Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ceDmitriy Zaporozhets2015-05-1111-37/+63
|\ \
| * \ Merge branch 'create-merge-request' into 'master'Dmitriy Zaporozhets2015-05-119-29/+52
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add Create Merge Request buttons to commits page and push event. Commits page: ![Screen_Shot_2015-05-09_at_22.27.09](https://gitlab.com/gitlab-org/gitlab-ce/uploads/f77c2e47f768b2fc132de6e3a2a0323e/Screen_Shot_2015-05-09_at_22.27.09.png) Branches page: ![Screen_Shot_2015-05-09_at_22.55.24](https://gitlab.com/gitlab-org/gitlab-ce/uploads/b0a6374f5c5d830ef19de9694e603c8f/Screen_Shot_2015-05-09_at_22.55.24.png) Push event: (Only for new branches, and only shown to the pushing user) ![Screen_Shot_2015-05-09_at_22.27.21](https://gitlab.com/gitlab-org/gitlab-ce/uploads/989c9cb66ee03d09b96809452749d2b8/Screen_Shot_2015-05-09_at_22.27.21.png) Push event with multiple commits and a Compare link: ![Screen_Shot_2015-05-09_at_22.28.01](https://gitlab.com/gitlab-org/gitlab-ce/uploads/a70c718e559f69177f9341c0af92707c/Screen_Shot_2015-05-09_at_22.28.01.png) See merge request !632
| | * | Fix commits feed button.create-merge-requestDouwe Maan2015-05-101-4/+4
| | | |
| | * | Improve create_mr_button? performance.Douwe Maan2015-05-091-5/+4
| | | |
| | * | Fix spec.Douwe Maan2015-05-091-1/+1
| | | |
| | * | Add Merge Request button to branches page.Douwe Maan2015-05-092-5/+8
| | | |
| | * | Add Create Merge Request buttons to commits page and push event.Douwe Maan2015-05-095-21/+41
| | | |
| | * | Link Commits tab to current branch from Compare page.Douwe Maan2015-05-092-2/+3
| | | |
| * | | Merge branch 'params-to-sym' into 'master'Dmitriy Zaporozhets2015-05-111-5/+5
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Don't symbolize params. See merge request !636
| | * | | Don't symbolize params.params-to-symDouwe Maan2015-05-111-5/+5
| | | | |
| * | | | Small improvements to style guide.Sytse Sijbrandij2015-05-111-3/+6
| | | | |
* | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-112-4/+12
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Merge pull request #8799 from jirutka/group-kerberosJeroen van Baarsen2015-05-112-4/+12
| |\ \ \ \ | | | | | | | | | | | | Make omniauth-kerberos dependency optional (add group 'kerberos')
| | * | | | Update installation instructions, make kerberos optionalJakub Jirutka2015-05-111-3/+11
| | | | | |
| | * | | | Make omniauth-kerberos dependency optional (add group 'kerberos')Jakub Jirutka2015-05-111-1/+1
| |/ / / /
* | | | | Merge branch 'migration-style-guide' into 'master'Sytse Sijbrandij2015-05-113-2/+43
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migration Style Guide Fixes #2305 See merge request !1821
| * | | | create migration style guide. Fixes #2305Job van der Voort2015-05-113-2/+43
|/ / / /
* | | | Merge branch 'brakeman-system' into 'master'Dmitriy Zaporozhets2015-05-111-1/+1
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow shell command guidelines in Brakeman task There is no real issue here because the shell command is completely static, but it is still nicer to just follow the guidelines in doc/development/shell_commands.md . See merge request !1819
| * | | Follow shell command guidelines in Brakeman taskJacob Vosmaer2015-05-111-1/+1
|/ / / | | | | | | | | | | | | | | | There is no real issue here because the shell command is completely static, but it is still nicer to just follow the guidelines in doc/development/shell_commands.md .
* | | Merge branch 'bug/fix-duplicate-deploy-keys' into 'master'Marin Jankovski2015-05-104-6/+18
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | Don't show duplicate deploy keys This fixes the issue described in [#1516](https://gitlab.com/gitlab-org/gitlab-ce/issues/1516) where you would see the same deploy key multiple times if it was used by multiple projects. See merge request !629
| * | Don't show duplicate deploy keys. Fixes #1516Maran2015-05-084-6/+18
| | |
* | | Merge branch 'rs-disallow-id-class' into 'master'Dmitriy Zaporozhets2015-05-095-36/+59
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove class and id attributes from SanitizationFilter whitelist Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2302 See merge request !631
| * | | Remove class and id attributes from SanitizationFilter whitelistrs-disallow-id-classRobert Speicher2015-05-085-36/+59
| | | |
* | | | Merge pull request #9244 from dreis2211/firefox_issuable_filter_patchDmitriy Zaporozhets2015-05-082-2/+7
|\ \ \ \ | | | | | | | | | | Fix Firefox problems when it wants to render issuable component
| * | | | Fix Firefox problems when it wants to render issuable componentdreis2015-05-052-2/+7
| | | | |
* | | | | Merge branch 'show_project_visibility' into 'master'Dmitriy Zaporozhets2015-05-082-2/+4
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | Move project visibility from clone bar to repository details block for non empty project. See merge request !1818
| * | | | Move project visibility from clone bar to repository details block for non ↵Marin Jankovski2015-05-082-2/+4
|/ / / / | | | | | | | | | | | | empty project.
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-05-0815-31/+132
|\ \ \ \
| * \ \ \ Merge pull request #9214 from Bugagazavr/hook-eventsValeriy Sizov2015-05-0815-31/+132
| |\ \ \ \ | | | | | | | | | | | | Added X-GitLab-Event header for web hooks
| | * | | | Added X-GitLab-Event header for web hooksbugagazavr2015-05-0815-31/+132
| | | | | |
* | | | | | Merge branch 'How_to_Reset_your_root_password' into 'master'Job van der Voort2015-05-082-0/+41
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | How to reset your root password Added link and file correctly on Security doc. Please review to make sure it's correct. See merge request !1811
| * | | | | make it more obvious what happens in the codeJob van der Voort2015-05-081-4/+4
| | | | | |
| * | | | | remove redundant colonJob van der Voort2015-05-081-1/+1
| | | | | |
| * | | | | Deleted > and commented "or" outKaren Carias2015-05-071-5/+9
| | | | | |
| * | | | | Added link to root password doc correctlyKaren Carias2015-05-071-0/+1
| | | | | |
| * | | | | New file to add to security documentation, "How to reset your root password"Karen Carias2015-04-281-0/+36
| | | | | |
* | | | | | Merge branch 'quote_string' into 'master'Valery Sizov2015-05-081-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding quote_string to migration See merge request !630
| * | | | | | Adding quote_string to migrationquote_stringValery Sizov2015-05-081-1/+2
| | | | | | |
* | | | | | | Merge branch 'fix_link_in_doc' into 'master'Valery Sizov2015-05-081-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Fix link to the CI documentation See merge request !627
| * | | | | | Fix link to the CI documentationValery Sizov2015-05-081-1/+1
|/ / / / / /
* | | | | | Merge branch 'backup_doc' into 'master'Sytse Sijbrandij2015-05-081-7/+67
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | Improved the backup documentation See merge request !621
| * | | | | improved backup docValery Sizov2015-05-081-7/+65
| | | | | |
| * | | | | Link to CI backup documentationbackup_docValery Sizov2015-05-071-0/+2
| | | | | |
View Lorry Controller Status