summaryrefslogtreecommitdiff
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Update Emoji sprite and its SCSS for new stylesrs-emojiRobert Speicher2016-02-172-1269/+1723
* Update Emoji asset pathRobert Speicher2016-02-121-1/+1
* Remove unused emoji_autocomplete_source helperRobert Speicher2016-02-121-6/+0
* Merge branch 'fix_500-commit-null' into 'master' Douwe Maan2016-02-121-1/+1
|\
| * Don't try to mark broken MR as mergableNemanja Boric2016-02-111-1/+1
* | Merge branch 'rs-issue-merge-requests' into 'master' Douwe Maan2016-02-121-3/+3
|\ \
| * | Correct indentation for `issues/merge_requests` partial renderrs-issue-merge-requestsRobert Speicher2016-02-111-3/+3
* | | Merge branch 'olirogers/gitlab-ce-project-milestone-order' into 'master' Douwe Maan2016-02-123-12/+9
|\ \ \
| * | | Fix milestone order in project and issue edit lists to due_dateolirogers/gitlab-ce-project-milestone-orderOliver Rogers2016-02-103-12/+9
* | | | Merge branch 'streamline-email-validation' into 'master' Douwe Maan2016-02-125-23/+6
|\ \ \ \
| * | | | Re-add EmailValidator to avoid the repetition of format: { with: Devise.email...streamline-email-validationRémy Coutable2016-02-095-6/+10
| * | | | Validate email addresses using Devise.email_regexpRémy Coutable2016-02-095-28/+7
* | | | | Don't show fork button if user can't fork the project.issue_13369Rubén Dávila2016-02-111-8/+9
* | | | | Move builds badge implementation to new badges controllerGrzegorz Bizon2016-02-112-10/+11
* | | | | Inherit build badge access permissions from projectGrzegorz Bizon2016-02-111-10/+4
* | | | | Respond to proper format for build badge requestGrzegorz Bizon2016-02-111-2/+8
* | | | | Move badge implementation to builds controllerGrzegorz Bizon2016-02-112-16/+10
* | | | | Skip authentication when requesting commit status badgeGrzegorz Bizon2016-02-111-1/+7
* | | | | Improve CI status badge implementationGrzegorz Bizon2016-02-112-15/+9
* | | | | Add CI status badge implementation to commit controllerGrzegorz Bizon2016-02-111-0/+6
* | | | | Render 404 if there is no project for old CI status badgeGrzegorz Bizon2016-02-111-0/+1
* | | | | Add deprecation warning for old CI status badge actionGrzegorz Bizon2016-02-111-1/+4
| |_|_|/ |/| | |
* | | | Merge branch 'display-mr-link-if-thre-is-one' into 'master' Douglas Barbosa Alexandre2016-02-105-9/+28
|\ \ \ \
| * | | | Change MR link to "View Open Merge Request"display-mr-link-if-thre-is-oneDouglas Barbosa Alexandre2016-02-102-2/+2
| * | | | Replaces "Create merge request" link with one to the MR when one existsDouglas Barbosa Alexandre2016-02-105-9/+28
| | |/ / | |/| |
* | | | Merge branch 'brammeleman/3047-add-assignee-data-to-isuable-hook-data' into '...Robert Speicher2016-02-101-1/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add assignee data to Issuables' hook_databrammeleman/3047-add-assignee-data-to-isuable-hook-dataBram Daams2016-02-101-1/+4
* | | | Merge branch 'cwq1913/gitlab-ce-fix_skip_merge_commits' into 'master' Robert Speicher2016-02-101-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Actually use the `skip_merges` option in Repository#commitscwq1913/gitlab-ce-fix_skip_merge_commitsTony Chu2016-02-081-1/+2
* | | | Merge branch 'fix-explore-filter' into 'master' Dmitriy Zaporozhets2016-02-1013-50/+90
|\ \ \ \ | |_|/ / |/| | |
| * | | Cleanup to use one selectorfix-explore-filterJosh Frye2016-02-095-8/+8
| * | | More specific selectorsJosh Frye2016-02-091-4/+4
| * | | MR feedbackJosh Frye2016-02-095-12/+9
| * | | Extract events rendering to own action.Josh Frye2016-02-095-17/+21
| * | | Starred, All, and Trending on explore are paged also group projects. Need aja...Josh Frye2016-02-097-14/+55
| * | | JS FixesJosh Frye2016-02-092-14/+15
| * | | Fix explore filter. Fixes #13182Josh Frye2016-02-093-24/+21
* | | | Ensure link for README blobs includes the full pathrs-issue-13254Robert Speicher2016-02-091-1/+1
* | | | Merge branch 'variables-build-log' into 'master' Robert Speicher2016-02-091-1/+3
|\ \ \ \
| * | | | Add information about expose of build variables.variables-build-logKamil Trzcinski2016-02-091-1/+3
| | |/ / | |/| |
* | | | Merge branch 'fix-logo-rasterization' into 'master' Robert Speicher2016-02-092-21/+10
|\ \ \ \
| * | | | Prevent rasterization artefacts in the logo, and simplify markup.Aaron Hamilton2016-02-082-21/+10
| |/ / /
* | | | Merge branch 'smarter-diverging-commit-cache-flushing' into 'master' Douwe Maan2016-02-092-13/+17
|\ \ \ \
| * | | | Smarter flushing of branch statistics cachesYorick Peterse2016-02-092-13/+17
* | | | | Merge remote-tracking branch 'dev/master' into 'master'Robert Speicher2016-02-0918-114/+93
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Merge branch 'ci-permissions' into 'master' Robert Speicher2016-02-0818-114/+93
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Remove current_user && when can? is usedKamil Trzcinski2016-02-052-2/+2
| | * | | Merge branch 'master' into ci-permissionsKamil Trzcinski2016-02-0565-338/+736
| | |\ \ \
| | * | | | Use `delete` instead of assignment operator when filtering build abilitiesKamil Trzcinski2016-02-041-1/+1
| | * | | | Update ability model after commentsKamil Trzcinski2016-02-041-24/+15