summaryrefslogtreecommitdiff
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Don't symbolize params.params-to-symDouwe Maan2015-05-111-5/+5
|
* Merge branch 'bug/fix-duplicate-deploy-keys' into 'master'Marin Jankovski2015-05-101-1/+1
|\ | | | | | | | | | | | | | | 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-081-1/+1
| |
* | 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
| | |
* | | Move project visibility from clone bar to repository details block for non ↵Marin Jankovski2015-05-082-2/+4
| | | | | | | | | | | | empty project.
* | | Merge pull request #9214 from Bugagazavr/hook-eventsValeriy Sizov2015-05-088-15/+25
|\ \ \ | |_|/ |/| | Added X-GitLab-Event header for web hooks
| * | Added X-GitLab-Event header for web hooksbugagazavr2015-05-088-15/+25
| | |
* | | Merge branch 'rs-task_list' into 'master'Dmitriy Zaporozhets2015-05-0815-111/+166
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use task_list gem for task lists Task Lists can now be used in comments, and they'll render in previews. :clap: Closes internal https://dev.gitlab.org/gitlab/gitlabhq/issues/2271 See merge request !599
| * | | Fix header link anchorsRobert Speicher2015-05-061-1/+3
| | | |
| * | | Change wording for task list summariesRobert Speicher2015-05-061-2/+2
| | | |
| * | | More JS dependency requirementsRobert Speicher2015-05-064-1/+7
| | | |
| * | | Make issue JS require its dependenciesRobert Speicher2015-05-061-0/+2
| | | |
| * | | Make notes JS require its dependenciesRobert Speicher2015-05-061-3/+11
| | | |
| * | | Change padding for task lists in notesRobert Speicher2015-05-061-0/+10
| | | |
| * | | Don't add js-task-list-container to things the user can't editRobert Speicher2015-05-064-4/+8
| | | |
| * | | Single quotes/icon helper in viewsRobert Speicher2015-05-065-39/+39
| | | |
| * | | Remove all references to `parse_tasks`Robert Speicher2015-05-062-2/+2
| | | |
| * | | Update Taskable to use TaskListRobert Speicher2015-05-061-30/+15
| | | |
| * | | Update task list behavior for Merge RequestsRobert Speicher2015-05-063-6/+27
| | | |
| * | | Update task list behavior for NotesRobert Speicher2015-05-063-4/+20
| | | |
| * | | Update task list behavior for IssuesRobert Speicher2015-05-063-6/+27
| | | |
| * | | Add task_list JSRobert Speicher2015-05-061-0/+1
| | | |
| * | | Remove taskable.jsRobert Speicher2015-05-061-21/+0
| | | |
* | | | Merge pull request #9254 from gitlabhq/revert-8800-email-settingsDmitriy Zaporozhets2015-05-083-7/+7
|\ \ \ \ | |_|/ / |/| | | Revert "Allow to configure smtp and sendmail in gitlab.yml"
| * | | Revert "Allow to configure smtp and sendmail in gitlab.yml"Dmitriy Zaporozhets2015-05-063-7/+7
| | | |
* | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqMarin Jankovski2015-05-083-17/+30
|\ \ \ \
| * | | | Fix bootlint issues on git clone holder barSullivan SENECHAL2015-05-073-17/+30
| | |/ / | |/| |
* | | | Merge branch 'rs-fix-filter-tooltips' into 'master'Robert Speicher2015-05-071-4/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Fix tooltips for event filter links See merge request !618
| * | | | Fix tooltips for event filter linksrs-fix-filter-tooltipsRobert Speicher2015-05-061-4/+8
| |/ / /
* | | | Merge branch 'feature/handle-big-diffs' into 'master'Douwe Maan2015-05-073-9/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve handling of large diffs Diffs with a large number of changed lines time out (504 HTTP error) or generate a HTML page that's so heavy web browsers struggle with it. https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on commit line count so that only a safe portion is rendered. This was later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab. This patch re-introduces a safe limit on number of lines. See merge request !539
| * | | | Improve handling of large diffsAlex Lossent2015-05-053-9/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diffs with a large number of changed lines time out (504 HTTP error) or generate a HTML page that's so heavy web browsers struggle with it. https://github.com/gitlabhq/gitlabhq/pull/5014 introduced limits on commit line count so that only a safe portion is rendered. This was later undone by code refactoring in be5b6db8, e0eb4803 and c741fcab. This patch re-introduces a safe limit on number of lines.
* | | | | Merge branch 'fix-default-branch' into 'master'Douwe Maan2015-05-071-0/+4
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the first branch pushed to an empty repository the default HEAD In an empty repository, pushing a new branch not called "master" would leave HEAD in an unknown state, causing ambiguity if another branch were pushed. This could in turn cause a new protected branch to be created and cause the default branch to change. * Closes #1561 * Closes #1576 * Closes https://github.com/gitlabhq/gitlabhq/issues/8883 See merge request !614
| * | | | Make the first branch pushed to an empty repository the default HEAD.Stan Hu2015-05-051-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In an empty repository, pushing a new branch not called "master" would leave HEAD in an unknown state, causing ambiguity if another branch were pushed. This could in turn cause a new protected branch to be created and cause the default branch to change. * Closes #1561 * Closes #1576 * Closes https://github.com/gitlabhq/gitlabhq/issues/8883
* | | | | Make header title bold and line between header lighterDmitriy Zaporozhets2015-05-061-4/+4
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | Merge branch 'refactor-mr-form' into 'master'Dmitriy Zaporozhets2015-05-063-74/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor mr form * re-use issuable form for new mr page * small UI improvements to MR compare and new pages See merge request !616
| * | | | | Small UI improvements to MR formDmitriy Zaporozhets2015-05-063-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | | | Re-use issuable_form for new merge requestDmitriy Zaporozhets2015-05-061-69/+6
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Merge branch 'master' of github.com:gitlabhq/gitlabhqDmitriy Zaporozhets2015-05-063-7/+7
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge pull request #8800 from jirutka/email-settingsDmitriy Zaporozhets2015-05-063-7/+7
| |\ \ \ \ \ | | |/ / / / | |/| | | | Allow to configure smtp and sendmail in gitlab.yml
| | * | | | Allow to configure smtp and sendmail in gitlab.ymlJakub Jirutka2015-05-063-7/+7
| | | | | |
* | | | | | Make README link on project home look nicerDmitriy Zaporozhets2015-05-061-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | | Small UI improvements to make project sidebar more neatDmitriy Zaporozhets2015-05-063-7/+10
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | | When use change branches link at MR form - save source branch selection ↵mr-change-branchesDmitriy Zaporozhets2015-05-062-1/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | instead of target one Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
* | | | Fix a trailing new lineStefan Tatschner2015-05-061-1/+0
| | | | | | | | | | | | | | | | | | | | The "How to Merge" modal included a trailing new line in the code block. This commit removes that disfigurement.
* | | | Merge pull request #9241 from Soullivaneuh/button-typeJeroen van Baarsen2015-05-064-4/+6
|\ \ \ \ | | | | | | | | | | Fix missing button types
| * | | | Fix missing button typesSullivan SENECHAL2015-05-054-4/+6
| | |_|/ | |/| |
* | | | Merge branch 'refactor-project-page' into 'master'Dmitriy Zaporozhets2015-05-068-191/+152
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve project home page usability I looked at project page and saw next problems with it: * a lot of information but not separated on blocks - hard to understand * unclear how to contribute to project Instead of complete redesign I followed step-by-step changes. ### Step 1 First of all I separated Repository and Contribution blocks. Contribution block should makes it easy for people to contribute. Even when we visit GitHub project page its not clear how to start. Our Contribution section should help with it. All repository stats and download button moved to Repository block. ![Screenshot_2015-05-05_11.49.16](https://gitlab.com/gitlab-org/gitlab-ce/uploads/e69977603acfdc381acb539b19e8cba1/Screenshot_2015-05-05_11.49.16.png) ### Step 2 Next step was to make top section less loaded. I moved clone panel to sidebar because it is very heavy element and rarely used. If you use web editor - you dont even use it. If you work via http/ssh you will copy remote only once. So my idea - it should be on home page but should not be in center of attention. ![Screenshot_2015-05-05_12.47.04](https://gitlab.com/gitlab-org/gitlab-ce/uploads/41633cc8915bb12c979230567b40aea4/Screenshot_2015-05-05_12.47.04.png) See merge request !610
| * | | Restlye project sidebar a bit to make it more clearDmitriy Zaporozhets2015-05-052-11/+16
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
| * | | Fix project description and avatar alignmentDmitriy Zaporozhets2015-05-054-70/+25
| | | | | | | | | | | | | | | | Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
View Lorry Controller Status